From e11020916f6f1071aef4695c62bd27ae8b510c57 Mon Sep 17 00:00:00 2001 From: gitadmin Date: Fri, 22 Aug 2025 00:24:01 +0900 Subject: [PATCH 1/3] =?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 | 20 ++++++++++++++++++++ .gitea/workflows/deploy.yml | 14 -------------- 2 files changed, 20 insertions(+), 14 deletions(-) create mode 100644 .gitea/workflows/deploy-preview.yml delete mode 100644 .gitea/workflows/deploy.yml diff --git a/.gitea/workflows/deploy-preview.yml b/.gitea/workflows/deploy-preview.yml new file mode 100644 index 0000000..8f38e5d --- /dev/null +++ b/.gitea/workflows/deploy-preview.yml @@ -0,0 +1,20 @@ +name: Deploy preview (main_higashide) + +on: + push: + branches: ["main_higashide"] + workflow_dispatch: + +concurrency: + group: deploy-main_higashide + cancel-in-progress: true + +jobs: + deploy: + runs-on: ["native"] + steps: + - uses: actions/checkout@v4 + - name: Deploy to preview (main_higashide) + env: + BRANCH: main_higashide + run: /usr/local/bin/deploy_branch_simple.sh \ No newline at end of file diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml deleted file mode 100644 index c6f2c84..0000000 --- a/.gitea/workflows/deploy.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: Deploy so-manager (auto) - -on: - push: - branches: [ "main" ] - workflow_dispatch: - -jobs: - deploy: - runs-on: [ "native" ] - steps: - - uses: actions/checkout@v4 - - name: Deploy to server - run: /usr/local/bin/deploy_so.sh From aea8fd7376f93cbd5921568827427bdc4479929f Mon Sep 17 00:00:00 2001 From: gitadmin Date: Fri, 22 Aug 2025 00:29:47 +0900 Subject: [PATCH 2/3] =?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 855cd06..5b76b16 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://so-manager-dev.com/ +APP_URL=https://branch.so-manager-dev.com/main_higashide/ APP_LOCALE=ja APP_FALLBACK_LOCALE=ja From 253adaee7516a3f669ff18252a8d8664bfc6d14f Mon Sep 17 00:00:00 2001 From: gitadmin Date: Fri, 22 Aug 2025 02:35:09 +0900 Subject: [PATCH 3/3] =?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 5b76b16..a35b9f8 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_higashide/ +APP_URL=https://main-higashide.so-manager-dev.com/ APP_LOCALE=ja APP_FALLBACK_LOCALE=ja