From 6d418d31e569e1a8159af2f20fd23eae25eba588 Mon Sep 17 00:00:00 2001 From: ay-eonii Date: Thu, 24 Oct 2024 11:37:08 +0900 Subject: [PATCH 1/2] =?UTF-8?q?chore:=20=EC=84=9C=EB=B2=84=EB=B3=84=20?= =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/be-rolling-deploy.yml | 2 +- .github/workflows/cd-prod.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/be-rolling-deploy.yml b/.github/workflows/be-rolling-deploy.yml index 2f5568ff3..ea6c9c6ff 100644 --- a/.github/workflows/be-rolling-deploy.yml +++ b/.github/workflows/be-rolling-deploy.yml @@ -3,7 +3,7 @@ name: Rolling Deployment on: push: branches: - - develop + - main jobs: deploy-prod1: diff --git a/.github/workflows/cd-prod.yml b/.github/workflows/cd-prod.yml index ad92e2a48..cbf078423 100644 --- a/.github/workflows/cd-prod.yml +++ b/.github/workflows/cd-prod.yml @@ -3,7 +3,7 @@ name: cd-prod on: push: branches: - - develop +# - develop jobs: deploy-on-prod1: From 60b7341be4e072cf2eebd938fe3265769a3c9f77 Mon Sep 17 00:00:00 2001 From: ay-eonii Date: Thu, 24 Oct 2024 11:50:26 +0900 Subject: [PATCH 2/2] =?UTF-8?q?chore:=20=EA=B5=AC=20prod=20=EC=8A=A4?= =?UTF-8?q?=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd-prod.yml | 40 ----------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 .github/workflows/cd-prod.yml diff --git a/.github/workflows/cd-prod.yml b/.github/workflows/cd-prod.yml deleted file mode 100644 index cbf078423..000000000 --- a/.github/workflows/cd-prod.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: cd-prod - -on: - push: - branches: -# - develop - -jobs: - deploy-on-prod1: - runs-on: [self-hosted, runner-prod1] - - steps: - - name: update properties if exists - run: | - if [ -n "${{ secrets.NEW_PROPERTIES }}" ]; then - cd ~/deploy - echo "${{ secrets.NEW_PROPERTIES }}" > new_properties - ./update-properties.sh - fi - - - name: deploy - run: | - cd ~/deploy && ./deploy.sh - - deploy-on-prod2: - runs-on: [self-hosted, runner-prod2] - needs: deploy-on-prod1 - - steps: - - name: update properties if exists - run: | - if [ -n "${{ secrets.NEW_PROPERTIES }}" ]; then - cd ~/deploy - echo "${{ secrets.NEW_PROPERTIES }}" > new_properties - ./update-properties.sh - fi - - - name: deploy - run: | - cd ~/deploy && ./deploy.sh