Merge branch 'main_kin' of https://git.so-manager-dev.com/so-manager/krgm.so-manager-dev.com into main_kin
All checks were successful
Deploy preview (main_kin) / deploy (push) Successful in 14s

This commit is contained in:
kin.rinzen 2025-08-22 10:34:10 +09:00
commit 18db7a0770
3 changed files with 8 additions and 27 deletions

2
.env
View File

@ -2,7 +2,7 @@ APP_NAME=so-manager
APP_ENV=local APP_ENV=local
APP_KEY=base64:ejLwJbt2bEXY9emPUmsurG+X1hzkjTxQQvq2/FO14RY= APP_KEY=base64:ejLwJbt2bEXY9emPUmsurG+X1hzkjTxQQvq2/FO14RY=
APP_DEBUG=true APP_DEBUG=true
APP_URL=https://krgm.so-manager-dev.com/ APP_URL=https://main-kin.so-manager-dev.com/
APP_LOCALE=ja APP_LOCALE=ja
APP_FALLBACK_LOCALE=ja APP_FALLBACK_LOCALE=ja

View File

@ -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

View File

@ -1,21 +1,20 @@
name: Deploy previews (main_*) name: Deploy preview (main_kin)
on: on:
push: push:
branches: branches: ["main_kin"]
- 'main_*'
workflow_dispatch: workflow_dispatch:
concurrency: concurrency:
group: deploy-${{ github.ref }} group: deploy-main_kin
cancel-in-progress: true cancel-in-progress: true
jobs: jobs:
preview: deploy:
runs-on: ["native"] runs-on: ["native"]
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Deploy preview for this branch - name: Deploy to preview (main_kin)
env: env:
BRANCH: ${{ github.ref_name }} BRANCH: main_kin
run: /usr/local/bin/deploy_krgm_branch.sh run: /usr/local/bin/deploy_branch_simple.sh