From dff89ec3f8592b8f82d874d03884ec40109d44de Mon Sep 17 00:00:00 2001 From: gitadmin Date: Fri, 22 Aug 2025 00:22:25 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/deplo?= =?UTF-8?q?y-preview.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/deploy-preview.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/deploy-preview.yml b/.gitea/workflows/deploy-preview.yml index e8893a0..6af5828 100644 --- a/.gitea/workflows/deploy-preview.yml +++ b/.gitea/workflows/deploy-preview.yml @@ -1,21 +1,20 @@ -name: Deploy previews (main_*) +name: Deploy preview (main_kin) on: push: - branches: - - 'main_*' + branches: ["main_kin"] workflow_dispatch: concurrency: - group: deploy-${{ github.ref }} + group: deploy-main_kin cancel-in-progress: true jobs: - preview: + deploy: runs-on: ["native"] steps: - uses: actions/checkout@v4 - - name: Deploy preview for this branch + - name: Deploy to preview (main_kin) env: - BRANCH: ${{ github.ref_name }} - run: /usr/local/bin/deploy_krgm_branch.sh + BRANCH: main_kin + run: /usr/local/bin/deploy_branch_simple.sh \ No newline at end of file From 6899cd182cbc5585d7e3f93964bee15c20f71082 Mon Sep 17 00:00:00 2001 From: gitadmin Date: Fri, 22 Aug 2025 00:23:32 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=20.gitea/workflows/deplo?= =?UTF-8?q?y-main.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/deploy-main.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .gitea/workflows/deploy-main.yml diff --git a/.gitea/workflows/deploy-main.yml b/.gitea/workflows/deploy-main.yml deleted file mode 100644 index daca08f..0000000 --- a/.gitea/workflows/deploy-main.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Deploy main - -on: - push: - branches: ["main"] - workflow_dispatch: - -concurrency: - group: deploy-${{ github.ref }} - cancel-in-progress: true - -jobs: - deploy: - runs-on: ["native"] - steps: - - uses: actions/checkout@v4 - - name: Deploy main to server - run: /usr/local/bin/deploy_krgm.sh From 5de81090cd38224ed1e41be479c44c9c11657d94 Mon Sep 17 00:00:00 2001 From: gitadmin Date: Fri, 22 Aug 2025 00:28:21 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.env?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 5ebf6e4..3b3f5a2 100644 --- a/.env +++ b/.env @@ -2,7 +2,7 @@ APP_NAME=so-manager APP_ENV=local APP_KEY=base64:ejLwJbt2bEXY9emPUmsurG+X1hzkjTxQQvq2/FO14RY= APP_DEBUG=true -APP_URL=https://krgm.so-manager-dev.com/ +APP_URL=https://branch.so-manager-dev.com/main_kin/ APP_LOCALE=ja APP_FALLBACK_LOCALE=ja From cb270955c92cbf2a3beb8a01f485c3c699d18632 Mon Sep 17 00:00:00 2001 From: gitadmin Date: Fri, 22 Aug 2025 02:33:27 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.env?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 3b3f5a2..b01098b 100644 --- a/.env +++ b/.env @@ -2,7 +2,7 @@ APP_NAME=so-manager APP_ENV=local APP_KEY=base64:ejLwJbt2bEXY9emPUmsurG+X1hzkjTxQQvq2/FO14RY= APP_DEBUG=true -APP_URL=https://branch.so-manager-dev.com/main_kin/ +APP_URL=https://main-kin.so-manager-dev.com/ APP_LOCALE=ja APP_FALLBACK_LOCALE=ja