From 07930dde5d50b51d060f5c87d293b9294cde82ca Mon Sep 17 00:00:00 2001 From: thgee Date: Thu, 25 Jul 2024 11:34:21 +0900 Subject: [PATCH 01/19] __test --- .github/workflows/fb-hosting-service-merge.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/fb-hosting-service-merge.yml b/.github/workflows/fb-hosting-service-merge.yml index 88ddd0c0..4d82fcb3 100644 --- a/.github/workflows/fb-hosting-service-merge.yml +++ b/.github/workflows/fb-hosting-service-merge.yml @@ -6,7 +6,7 @@ name: Deploy Serivce to Firebase Hosting on merge push: branches: - main -jobs: + s: build_and_deploy: runs-on: ubuntu-latest environment: production @@ -55,4 +55,5 @@ jobs: target: service repoToken: '${{ secrets.GITHUB_TOKEN }}' firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_WATERMELON_CLAP }}' - projectId: watermelon-clap \ No newline at end of file + projectId: watermelon-clap + channelId: live \ No newline at end of file From de6267e72d1b4fecd37894aa1971f902b15a2e32 Mon Sep 17 00:00:00 2001 From: thgee Date: Thu, 25 Jul 2024 14:16:14 +0900 Subject: [PATCH 02/19] =?UTF-8?q?build:=20admin=20CI/CD=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=B4=ED=94=84=EB=9D=BC=EC=9D=B8=20=EA=B5=AC=EC=B6=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/fb-hosting-admin-merge.yml | 59 +++++++++++++++++++ .../fb-hosting-admin-pull-request.yml | 56 ++++++++++++++++++ .../workflows/fb-hosting-service-merge.yml | 2 +- 3 files changed, 116 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/fb-hosting-admin-merge.yml create mode 100644 .github/workflows/fb-hosting-admin-pull-request.yml diff --git a/.github/workflows/fb-hosting-admin-merge.yml b/.github/workflows/fb-hosting-admin-merge.yml new file mode 100644 index 00000000..27f983c7 --- /dev/null +++ b/.github/workflows/fb-hosting-admin-merge.yml @@ -0,0 +1,59 @@ +# This file was auto-generated by the Firebase CLI +# https://github.com/firebase/firebase-tools + +name: Deploy Admin to Firebase Hosting on merge +'on': + push: + branches: + - main + s: + build_and_deploy: + runs-on: ubuntu-latest + environment: production + defaults: + run: + working-directory: packages/admin + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: Make Last Hash + id: last + run: | + LAST_HASH=$(git rev-parse HEAD~:packages/admin) + echo "::set-output name=hash::$LAST_HASH" + + - name: Make Current Hash + id: current + run: | + CURRENT_HASH=$(git rev-parse HEAD:packages/admin) + echo "::set-output name=hash::$CURRENT_HASH" + + - name: Set Diff + id: diff-check + run: | + if [ "${{ steps.last.outputs.hash }}" != "${{ steps.current.outputs.hash }}" ]; then + echo "::set-output name=diff::true" + else + echo "::set-output name=diff::false" + fi + + - name: Create .env file + if: ${{steps.diff-check.outputs.diff == 'true'}} + run: | + jq -r 'to_entries|map("\(.key)=\(.value|tostring)")|.[]' <<< "$SECRETS_CONTEXT" > .env + env: + SECRETS_CONTEXT: ${{ toJson(secrets) }} + - name: Install Dependencies and Build + if: ${{steps.diff-check.outputs.diff == 'true'}} + run: | + npm install -g pnpm && pnpm install && pnpm build + - name: Deploy to Firebase Hosting + if: ${{steps.diff-check.outputs.diff == 'true'}} + uses: FirebaseExtended/action-hosting-deploy@v0 + with: + target: admin + repoToken: '${{ secrets.GITHUB_TOKEN }}' + firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_WATERMELON_CLAP }}' + projectId: watermelon-clap + channelId: live \ No newline at end of file diff --git a/.github/workflows/fb-hosting-admin-pull-request.yml b/.github/workflows/fb-hosting-admin-pull-request.yml new file mode 100644 index 00000000..3daf0dbd --- /dev/null +++ b/.github/workflows/fb-hosting-admin-pull-request.yml @@ -0,0 +1,56 @@ +name: Deploy Admin to Firebase Hosting on PR +on: pull_request +jobs: + + + build_and_preview: + if: ${{ github.event.pull_request.head.repo.full_name == github.repository }} + runs-on: ubuntu-latest + environment: preview + defaults: + run: + working-directory: packages/admin + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: Make Last Hash + id: last + run: | + LAST_HASH=$(git rev-parse origin/main:packages/admin) + echo "::set-output name=hash::$LAST_HASH" + + - name: Make Current Hash + id: current + run: | + CURRENT_HASH=$(git rev-parse HEAD:packages/admin) + echo "::set-output name=hash::$CURRENT_HASH" + + - name: Set Diff + id: diff-check + run: | + if [ "${{ steps.last.outputs.hash }}" != "${{ steps.current.outputs.hash }}" ]; then + echo "::set-output name=diff::true" + else + echo "::set-output name=diff::false" + fi + - name: Create .env file + if: ${{ steps.diff-check.outputs.diff == 'true' }} + run: | + jq -r 'to_entries|map("\(.key)=\(.value|tostring)")|.[]' <<< "$SECRETS_CONTEXT" > .env + env: + SECRETS_CONTEXT: ${{ toJson(secrets) }} + + - name: Install Dependencies and Build + if: ${{ steps.diff-check.outputs.diff == 'true' }} + run: | + npm install -g pnpm && pnpm install && pnpm build + + - name: Deploy to Firebase Hosting + if: ${{ steps.diff-check.outputs.diff == 'true' }} + uses: FirebaseExtended/action-hosting-deploy@v0 + with: + target: admin + repoToken: ${{ secrets.GITHUB_TOKEN }} + firebaseServiceAccount: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_WATERMELON_CLAP }} + projectId: watermelon-clap diff --git a/.github/workflows/fb-hosting-service-merge.yml b/.github/workflows/fb-hosting-service-merge.yml index 4d82fcb3..52f5cc7a 100644 --- a/.github/workflows/fb-hosting-service-merge.yml +++ b/.github/workflows/fb-hosting-service-merge.yml @@ -1,7 +1,7 @@ # This file was auto-generated by the Firebase CLI # https://github.com/firebase/firebase-tools -name: Deploy Serivce to Firebase Hosting on merge +name: Deploy Service to Firebase Hosting on merge 'on': push: branches: From 544209af493158d708f407bd8bf6da3f1d01a4f9 Mon Sep 17 00:00:00 2001 From: thgee Date: Thu, 25 Jul 2024 14:27:29 +0900 Subject: [PATCH 03/19] =?UTF-8?q?build:=20admin=20CI/CD=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=B4=ED=94=84=EB=9D=BC=EC=9D=B8=20=EA=B5=AC=EC=B6=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/fb-hosting-admin-pull-request.yml | 6 ++++++ .github/workflows/fb-hosting-service-pull-request.yml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/.github/workflows/fb-hosting-admin-pull-request.yml b/.github/workflows/fb-hosting-admin-pull-request.yml index 3daf0dbd..a2b87ff7 100644 --- a/.github/workflows/fb-hosting-admin-pull-request.yml +++ b/.github/workflows/fb-hosting-admin-pull-request.yml @@ -54,3 +54,9 @@ jobs: repoToken: ${{ secrets.GITHUB_TOKEN }} firebaseServiceAccount: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_WATERMELON_CLAP }} projectId: watermelon-clap + + - name: Comment PR + uses: thollander/actions-comment-pull-request@v2 + with: + message: | + admin diff --git a/.github/workflows/fb-hosting-service-pull-request.yml b/.github/workflows/fb-hosting-service-pull-request.yml index 6411d5a8..40a8ead1 100644 --- a/.github/workflows/fb-hosting-service-pull-request.yml +++ b/.github/workflows/fb-hosting-service-pull-request.yml @@ -54,3 +54,9 @@ jobs: repoToken: ${{ secrets.GITHUB_TOKEN }} firebaseServiceAccount: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_WATERMELON_CLAP }} projectId: watermelon-clap + + - name: Comment PR + uses: thollander/actions-comment-pull-request@v2 + with: + message: | + service \ No newline at end of file From 24bf1bbb5b5e1264a2b8f3d3270a686dfcfd2497 Mon Sep 17 00:00:00 2001 From: thgee Date: Thu, 25 Jul 2024 14:32:57 +0900 Subject: [PATCH 04/19] =?UTF-8?q?build:=20admin=20CI/CD=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=B4=ED=94=84=EB=9D=BC=EC=9D=B8=20=EA=B5=AC=EC=B6=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/fb-hosting-admin-pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fb-hosting-admin-pull-request.yml b/.github/workflows/fb-hosting-admin-pull-request.yml index a2b87ff7..2a01d89e 100644 --- a/.github/workflows/fb-hosting-admin-pull-request.yml +++ b/.github/workflows/fb-hosting-admin-pull-request.yml @@ -55,7 +55,7 @@ jobs: firebaseServiceAccount: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_WATERMELON_CLAP }} projectId: watermelon-clap - - name: Comment PR + - name: Comment PR uses: thollander/actions-comment-pull-request@v2 with: message: | From 37937dca2b92014bd9edb2ab2156e39dbd2eab3c Mon Sep 17 00:00:00 2001 From: thgee Date: Thu, 25 Jul 2024 14:39:45 +0900 Subject: [PATCH 05/19] =?UTF-8?q?build:=20admin=20CI/CD=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=B4=ED=94=84=EB=9D=BC=EC=9D=B8=20=EA=B5=AC=EC=B6=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/fb-hosting-admin-pull-request.yml | 1 + .github/workflows/fb-hosting-service-pull-request.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/fb-hosting-admin-pull-request.yml b/.github/workflows/fb-hosting-admin-pull-request.yml index 2a01d89e..a00f0b85 100644 --- a/.github/workflows/fb-hosting-admin-pull-request.yml +++ b/.github/workflows/fb-hosting-admin-pull-request.yml @@ -56,6 +56,7 @@ jobs: projectId: watermelon-clap - name: Comment PR + if: ${{ steps.diff-check.outputs.diff == 'true' }} uses: thollander/actions-comment-pull-request@v2 with: message: | diff --git a/.github/workflows/fb-hosting-service-pull-request.yml b/.github/workflows/fb-hosting-service-pull-request.yml index 40a8ead1..313ead43 100644 --- a/.github/workflows/fb-hosting-service-pull-request.yml +++ b/.github/workflows/fb-hosting-service-pull-request.yml @@ -56,6 +56,7 @@ jobs: projectId: watermelon-clap - name: Comment PR + if: ${{ steps.diff-check.outputs.diff == 'true' }} uses: thollander/actions-comment-pull-request@v2 with: message: | From 87ce6059d5603fe1254ebcf1d0845de80cd0016c Mon Sep 17 00:00:00 2001 From: thgee Date: Thu, 25 Jul 2024 14:41:30 +0900 Subject: [PATCH 06/19] __test --- packages/admin/src/App.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/admin/src/App.tsx b/packages/admin/src/App.tsx index 5c32caf6..8730c160 100644 --- a/packages/admin/src/App.tsx +++ b/packages/admin/src/App.tsx @@ -7,4 +7,4 @@ export const App = () => { ); -}; \ No newline at end of file +}; From 338f307a04770520cb1eca5c7133bc5b7ac9a480 Mon Sep 17 00:00:00 2001 From: thgee Date: Thu, 25 Jul 2024 14:46:56 +0900 Subject: [PATCH 07/19] __test --- .github/workflows/fb-hosting-admin-pull-request.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/fb-hosting-admin-pull-request.yml b/.github/workflows/fb-hosting-admin-pull-request.yml index a00f0b85..572d5596 100644 --- a/.github/workflows/fb-hosting-admin-pull-request.yml +++ b/.github/workflows/fb-hosting-admin-pull-request.yml @@ -49,6 +49,7 @@ jobs: - name: Deploy to Firebase Hosting if: ${{ steps.diff-check.outputs.diff == 'true' }} uses: FirebaseExtended/action-hosting-deploy@v0 + id: deploy with: target: admin repoToken: ${{ secrets.GITHUB_TOKEN }} @@ -60,4 +61,5 @@ jobs: uses: thollander/actions-comment-pull-request@v2 with: message: | - admin + admin ${{ steps.deploy.outputs.urls[0]}} + From 654a9db1c815b3ce5b9e26330927aa6ba19b3bd8 Mon Sep 17 00:00:00 2001 From: thgee Date: Thu, 25 Jul 2024 14:48:33 +0900 Subject: [PATCH 08/19] __test --- .github/workflows/fb-hosting-admin-pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fb-hosting-admin-pull-request.yml b/.github/workflows/fb-hosting-admin-pull-request.yml index 572d5596..a2881533 100644 --- a/.github/workflows/fb-hosting-admin-pull-request.yml +++ b/.github/workflows/fb-hosting-admin-pull-request.yml @@ -61,5 +61,5 @@ jobs: uses: thollander/actions-comment-pull-request@v2 with: message: | - admin ${{ steps.deploy.outputs.urls[0]}} + admin ${{ steps.deploy.outputs.urls}} From caa7fbd60d9e8b3b342036e9b45851f84d11a82b Mon Sep 17 00:00:00 2001 From: thgee Date: Thu, 25 Jul 2024 14:51:57 +0900 Subject: [PATCH 09/19] __test --- .github/workflows/fb-hosting-admin-pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fb-hosting-admin-pull-request.yml b/.github/workflows/fb-hosting-admin-pull-request.yml index a2881533..816ef022 100644 --- a/.github/workflows/fb-hosting-admin-pull-request.yml +++ b/.github/workflows/fb-hosting-admin-pull-request.yml @@ -61,5 +61,5 @@ jobs: uses: thollander/actions-comment-pull-request@v2 with: message: | - admin ${{ steps.deploy.outputs.urls}} + admin ${{ steps.deploy.outputs.details_url}} From 69056ae0f3d32973a716fd5348eba66329284bf3 Mon Sep 17 00:00:00 2001 From: thgee Date: Thu, 25 Jul 2024 15:06:13 +0900 Subject: [PATCH 10/19] __test --- .github/workflows/fb-hosting-admin-pull-request.yml | 6 ++++-- .github/workflows/fb-hosting-service-pull-request.yml | 9 +++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/fb-hosting-admin-pull-request.yml b/.github/workflows/fb-hosting-admin-pull-request.yml index 816ef022..8ce504ce 100644 --- a/.github/workflows/fb-hosting-admin-pull-request.yml +++ b/.github/workflows/fb-hosting-admin-pull-request.yml @@ -57,9 +57,11 @@ jobs: projectId: watermelon-clap - name: Comment PR - if: ${{ steps.diff-check.outputs.diff == 'true' }} + if: ${{ steps.diff-check.outputs.diff == 'true'}} uses: thollander/actions-comment-pull-request@v2 with: message: | - admin ${{ steps.deploy.outputs.details_url}} + Finish admin deployment! + + preview url: ${{ steps.deploy.outputs.details_url}} diff --git a/.github/workflows/fb-hosting-service-pull-request.yml b/.github/workflows/fb-hosting-service-pull-request.yml index 313ead43..971b1ab5 100644 --- a/.github/workflows/fb-hosting-service-pull-request.yml +++ b/.github/workflows/fb-hosting-service-pull-request.yml @@ -49,6 +49,7 @@ jobs: - name: Deploy to Firebase Hosting if: ${{ steps.diff-check.outputs.diff == 'true' }} uses: FirebaseExtended/action-hosting-deploy@v0 + id: deploy with: target: service repoToken: ${{ secrets.GITHUB_TOKEN }} @@ -56,8 +57,12 @@ jobs: projectId: watermelon-clap - name: Comment PR - if: ${{ steps.diff-check.outputs.diff == 'true' }} + if: ${{ steps.diff-check.outputs.diff == 'true'}} uses: thollander/actions-comment-pull-request@v2 with: message: | - service \ No newline at end of file + Finish service deployment! + + preview url: ${{ steps.deploy.outputs.details_url}} + + \ No newline at end of file From 19f4aa61ffe7dfd9c74b1b70ded57026a806e367 Mon Sep 17 00:00:00 2001 From: thgee Date: Thu, 25 Jul 2024 15:50:32 +0900 Subject: [PATCH 11/19] __test --- .github/workflows/fb-hosting-admin-merge.yml | 4 ++-- .github/workflows/fb-hosting-admin-pull-request.yml | 8 +++++--- .github/workflows/fb-hosting-service-merge.yml | 6 +++--- .github/workflows/fb-hosting-service-pull-request.yml | 9 ++++++--- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.github/workflows/fb-hosting-admin-merge.yml b/.github/workflows/fb-hosting-admin-merge.yml index 27f983c7..441c9623 100644 --- a/.github/workflows/fb-hosting-admin-merge.yml +++ b/.github/workflows/fb-hosting-admin-merge.yml @@ -6,10 +6,10 @@ name: Deploy Admin to Firebase Hosting on merge push: branches: - main - s: +jobs: build_and_deploy: runs-on: ubuntu-latest - environment: production + environment: admin-production defaults: run: working-directory: packages/admin diff --git a/.github/workflows/fb-hosting-admin-pull-request.yml b/.github/workflows/fb-hosting-admin-pull-request.yml index 8ce504ce..3e5b2d75 100644 --- a/.github/workflows/fb-hosting-admin-pull-request.yml +++ b/.github/workflows/fb-hosting-admin-pull-request.yml @@ -6,7 +6,7 @@ jobs: build_and_preview: if: ${{ github.event.pull_request.head.repo.full_name == github.repository }} runs-on: ubuntu-latest - environment: preview + environment: admin-preview defaults: run: working-directory: packages/admin @@ -37,7 +37,8 @@ jobs: - name: Create .env file if: ${{ steps.diff-check.outputs.diff == 'true' }} run: | - jq -r 'to_entries|map("\(.key)=\(.value|tostring)")|.[]' <<< "$SECRETS_CONTEXT" > .env + jq -r 'to_entries|map("\(.key)=\(.value|tostring)")|.[]' <<< "$vars" > .env + echo "$vars" env: SECRETS_CONTEXT: ${{ toJson(secrets) }} @@ -51,6 +52,7 @@ jobs: uses: FirebaseExtended/action-hosting-deploy@v0 id: deploy with: + disableComment: false target: admin repoToken: ${{ secrets.GITHUB_TOKEN }} firebaseServiceAccount: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_WATERMELON_CLAP }} @@ -62,6 +64,6 @@ jobs: with: message: | Finish admin deployment! - preview url: ${{ steps.deploy.outputs.details_url}} + expire: ${{ steps.deploy.outputs.expire_time_formatted}} diff --git a/.github/workflows/fb-hosting-service-merge.yml b/.github/workflows/fb-hosting-service-merge.yml index 52f5cc7a..7f887f32 100644 --- a/.github/workflows/fb-hosting-service-merge.yml +++ b/.github/workflows/fb-hosting-service-merge.yml @@ -5,11 +5,11 @@ name: Deploy Service to Firebase Hosting on merge 'on': push: branches: - - main - s: + - main +jobs: build_and_deploy: runs-on: ubuntu-latest - environment: production + environment: service-production defaults: run: working-directory: packages/service diff --git a/.github/workflows/fb-hosting-service-pull-request.yml b/.github/workflows/fb-hosting-service-pull-request.yml index 971b1ab5..71f0b3cb 100644 --- a/.github/workflows/fb-hosting-service-pull-request.yml +++ b/.github/workflows/fb-hosting-service-pull-request.yml @@ -6,7 +6,7 @@ jobs: build_and_preview: if: ${{ github.event.pull_request.head.repo.full_name == github.repository }} runs-on: ubuntu-latest - environment: preview + environment: service-preview defaults: run: working-directory: packages/service @@ -37,7 +37,8 @@ jobs: - name: Create .env file if: ${{ steps.diff-check.outputs.diff == 'true' }} run: | - jq -r 'to_entries|map("\(.key)=\(.value|tostring)")|.[]' <<< "$SECRETS_CONTEXT" > .env + jq -r 'to_entries|map("\(.key)=\(.value|tostring)")|.[]' <<< "$vars" > .env + echo "$vars" env: SECRETS_CONTEXT: ${{ toJson(secrets) }} @@ -55,6 +56,7 @@ jobs: repoToken: ${{ secrets.GITHUB_TOKEN }} firebaseServiceAccount: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_WATERMELON_CLAP }} projectId: watermelon-clap + disableComment: false - name: Comment PR if: ${{ steps.diff-check.outputs.diff == 'true'}} @@ -62,7 +64,8 @@ jobs: with: message: | Finish service deployment! - preview url: ${{ steps.deploy.outputs.details_url}} + expire: ${{ steps.deploy.outputs.expire_time_formatted}} + \ No newline at end of file From 690c413c73cacf52a94d14d0789e458ab1463f89 Mon Sep 17 00:00:00 2001 From: thgee Date: Thu, 25 Jul 2024 15:58:26 +0900 Subject: [PATCH 12/19] __test --- .github/workflows/fb-hosting-service-pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fb-hosting-service-pull-request.yml b/.github/workflows/fb-hosting-service-pull-request.yml index 71f0b3cb..933f6c74 100644 --- a/.github/workflows/fb-hosting-service-pull-request.yml +++ b/.github/workflows/fb-hosting-service-pull-request.yml @@ -38,7 +38,7 @@ jobs: if: ${{ steps.diff-check.outputs.diff == 'true' }} run: | jq -r 'to_entries|map("\(.key)=\(.value|tostring)")|.[]' <<< "$vars" > .env - echo "$vars" + echo vars env: SECRETS_CONTEXT: ${{ toJson(secrets) }} From 2b58bc345c8adc1168cb8812264c6de681800725 Mon Sep 17 00:00:00 2001 From: thgee Date: Thu, 25 Jul 2024 16:02:45 +0900 Subject: [PATCH 13/19] __test --- .github/workflows/fb-hosting-admin-pull-request.yml | 4 ++-- .github/workflows/fb-hosting-service-pull-request.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/fb-hosting-admin-pull-request.yml b/.github/workflows/fb-hosting-admin-pull-request.yml index 3e5b2d75..5a8931d5 100644 --- a/.github/workflows/fb-hosting-admin-pull-request.yml +++ b/.github/workflows/fb-hosting-admin-pull-request.yml @@ -37,8 +37,8 @@ jobs: - name: Create .env file if: ${{ steps.diff-check.outputs.diff == 'true' }} run: | - jq -r 'to_entries|map("\(.key)=\(.value|tostring)")|.[]' <<< "$vars" > .env - echo "$vars" + jq -r 'to_entries|map("\(.key)=\(.value|tostring)")|.[]' <<< "$ENVIRONMENT" > .env + echo "$ENVIRONMENT" env: SECRETS_CONTEXT: ${{ toJson(secrets) }} diff --git a/.github/workflows/fb-hosting-service-pull-request.yml b/.github/workflows/fb-hosting-service-pull-request.yml index 933f6c74..71f0b3cb 100644 --- a/.github/workflows/fb-hosting-service-pull-request.yml +++ b/.github/workflows/fb-hosting-service-pull-request.yml @@ -38,7 +38,7 @@ jobs: if: ${{ steps.diff-check.outputs.diff == 'true' }} run: | jq -r 'to_entries|map("\(.key)=\(.value|tostring)")|.[]' <<< "$vars" > .env - echo vars + echo "$vars" env: SECRETS_CONTEXT: ${{ toJson(secrets) }} From 207a8725d43d42e9b4885117fef81871ea28f4c0 Mon Sep 17 00:00:00 2001 From: thgee Date: Thu, 25 Jul 2024 16:04:23 +0900 Subject: [PATCH 14/19] __test --- .github/workflows/fb-hosting-admin-pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fb-hosting-admin-pull-request.yml b/.github/workflows/fb-hosting-admin-pull-request.yml index 5a8931d5..71c86ee4 100644 --- a/.github/workflows/fb-hosting-admin-pull-request.yml +++ b/.github/workflows/fb-hosting-admin-pull-request.yml @@ -38,7 +38,7 @@ jobs: if: ${{ steps.diff-check.outputs.diff == 'true' }} run: | jq -r 'to_entries|map("\(.key)=\(.value|tostring)")|.[]' <<< "$ENVIRONMENT" > .env - echo "$ENVIRONMENT" + echo ENVIRONMENT env: SECRETS_CONTEXT: ${{ toJson(secrets) }} From afa466fd46634642f542114ddc6360bdf7d10565 Mon Sep 17 00:00:00 2001 From: thgee Date: Thu, 25 Jul 2024 16:05:25 +0900 Subject: [PATCH 15/19] __test --- .github/workflows/fb-hosting-admin-pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fb-hosting-admin-pull-request.yml b/.github/workflows/fb-hosting-admin-pull-request.yml index 71c86ee4..905350ed 100644 --- a/.github/workflows/fb-hosting-admin-pull-request.yml +++ b/.github/workflows/fb-hosting-admin-pull-request.yml @@ -38,7 +38,7 @@ jobs: if: ${{ steps.diff-check.outputs.diff == 'true' }} run: | jq -r 'to_entries|map("\(.key)=\(.value|tostring)")|.[]' <<< "$ENVIRONMENT" > .env - echo ENVIRONMENT + echo "$REPOSITORY_VAR" env: SECRETS_CONTEXT: ${{ toJson(secrets) }} From 1314c9ff18920e3580a1c9f3644d456d731954a6 Mon Sep 17 00:00:00 2001 From: thgee Date: Thu, 25 Jul 2024 16:07:18 +0900 Subject: [PATCH 16/19] __test --- .github/workflows/fb-hosting-admin-pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fb-hosting-admin-pull-request.yml b/.github/workflows/fb-hosting-admin-pull-request.yml index 905350ed..b52b07a0 100644 --- a/.github/workflows/fb-hosting-admin-pull-request.yml +++ b/.github/workflows/fb-hosting-admin-pull-request.yml @@ -38,7 +38,7 @@ jobs: if: ${{ steps.diff-check.outputs.diff == 'true' }} run: | jq -r 'to_entries|map("\(.key)=\(.value|tostring)")|.[]' <<< "$ENVIRONMENT" > .env - echo "$REPOSITORY_VAR" + echo "$OVERRIDE_VAR" env: SECRETS_CONTEXT: ${{ toJson(secrets) }} From cb8664a15c2b9df4c256e8aa1f05d8b03f530b82 Mon Sep 17 00:00:00 2001 From: thgee Date: Thu, 25 Jul 2024 16:11:11 +0900 Subject: [PATCH 17/19] __test --- .github/workflows/fb-hosting-admin-pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fb-hosting-admin-pull-request.yml b/.github/workflows/fb-hosting-admin-pull-request.yml index b52b07a0..6ccbbd34 100644 --- a/.github/workflows/fb-hosting-admin-pull-request.yml +++ b/.github/workflows/fb-hosting-admin-pull-request.yml @@ -38,7 +38,7 @@ jobs: if: ${{ steps.diff-check.outputs.diff == 'true' }} run: | jq -r 'to_entries|map("\(.key)=\(.value|tostring)")|.[]' <<< "$ENVIRONMENT" > .env - echo "$OVERRIDE_VAR" + echo $ENVIRONMENT env: SECRETS_CONTEXT: ${{ toJson(secrets) }} From 60ee24010c1aa9f0ebbf027ecfc6c34b8f6a9cef Mon Sep 17 00:00:00 2001 From: thgee Date: Thu, 25 Jul 2024 16:15:04 +0900 Subject: [PATCH 18/19] __test --- .github/workflows/fb-hosting-admin-pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fb-hosting-admin-pull-request.yml b/.github/workflows/fb-hosting-admin-pull-request.yml index 6ccbbd34..92677b5c 100644 --- a/.github/workflows/fb-hosting-admin-pull-request.yml +++ b/.github/workflows/fb-hosting-admin-pull-request.yml @@ -38,7 +38,7 @@ jobs: if: ${{ steps.diff-check.outputs.diff == 'true' }} run: | jq -r 'to_entries|map("\(.key)=\(.value|tostring)")|.[]' <<< "$ENVIRONMENT" > .env - echo $ENVIRONMENT + echo "::debug::${{toJson(vars)}}" env: SECRETS_CONTEXT: ${{ toJson(secrets) }} From 5daf1860e73e76cec378f71f88b1c6327c401b48 Mon Sep 17 00:00:00 2001 From: thgee Date: Thu, 25 Jul 2024 16:31:05 +0900 Subject: [PATCH 19/19] =?UTF-8?q?build:=20=ED=99=98=EA=B2=BD=EB=B3=80?= =?UTF-8?q?=EC=88=98=20=EC=8B=9C=ED=81=AC=EB=A6=BF=20->=20=EC=9D=BC?= =?UTF-8?q?=EB=B0=98=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/fb-hosting-admin-merge.yml | 5 +++-- .github/workflows/fb-hosting-admin-pull-request.yml | 5 ++--- .github/workflows/fb-hosting-service-merge.yml | 5 +++-- .github/workflows/fb-hosting-service-pull-request.yml | 5 ++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/fb-hosting-admin-merge.yml b/.github/workflows/fb-hosting-admin-merge.yml index 441c9623..ae1911f5 100644 --- a/.github/workflows/fb-hosting-admin-merge.yml +++ b/.github/workflows/fb-hosting-admin-merge.yml @@ -41,9 +41,10 @@ jobs: - name: Create .env file if: ${{steps.diff-check.outputs.diff == 'true'}} run: | - jq -r 'to_entries|map("\(.key)=\(.value|tostring)")|.[]' <<< "$SECRETS_CONTEXT" > .env + jq -r 'to_entries|map("\(.key)=\(.value|tostring)")|.[]' <<< "$VARS_CONTEXT" > .env env: - SECRETS_CONTEXT: ${{ toJson(secrets) }} + VARS_CONTEXT: ${{ toJson(vars) }} + - name: Install Dependencies and Build if: ${{steps.diff-check.outputs.diff == 'true'}} run: | diff --git a/.github/workflows/fb-hosting-admin-pull-request.yml b/.github/workflows/fb-hosting-admin-pull-request.yml index 92677b5c..6a8a8598 100644 --- a/.github/workflows/fb-hosting-admin-pull-request.yml +++ b/.github/workflows/fb-hosting-admin-pull-request.yml @@ -37,10 +37,9 @@ jobs: - name: Create .env file if: ${{ steps.diff-check.outputs.diff == 'true' }} run: | - jq -r 'to_entries|map("\(.key)=\(.value|tostring)")|.[]' <<< "$ENVIRONMENT" > .env - echo "::debug::${{toJson(vars)}}" + jq -r 'to_entries|map("\(.key)=\(.value|tostring)")|.[]' <<< "$VARS_CONTEXT" > .env env: - SECRETS_CONTEXT: ${{ toJson(secrets) }} + VARS_CONTEXT: ${{ toJson(vars) }} - name: Install Dependencies and Build if: ${{ steps.diff-check.outputs.diff == 'true' }} diff --git a/.github/workflows/fb-hosting-service-merge.yml b/.github/workflows/fb-hosting-service-merge.yml index 7f887f32..28fee193 100644 --- a/.github/workflows/fb-hosting-service-merge.yml +++ b/.github/workflows/fb-hosting-service-merge.yml @@ -41,9 +41,10 @@ jobs: - name: Create .env file if: ${{steps.diff-check.outputs.diff == 'true'}} run: | - jq -r 'to_entries|map("\(.key)=\(.value|tostring)")|.[]' <<< "$SECRETS_CONTEXT" > .env + jq -r 'to_entries|map("\(.key)=\(.value|tostring)")|.[]' <<< "$VARS_CONTEXT" > .env env: - SECRETS_CONTEXT: ${{ toJson(secrets) }} + VARS_CONTEXT: ${{ toJson(vars) }} + - name: Install Dependencies and Build if: ${{steps.diff-check.outputs.diff == 'true'}} run: | diff --git a/.github/workflows/fb-hosting-service-pull-request.yml b/.github/workflows/fb-hosting-service-pull-request.yml index 71f0b3cb..d4c96667 100644 --- a/.github/workflows/fb-hosting-service-pull-request.yml +++ b/.github/workflows/fb-hosting-service-pull-request.yml @@ -37,10 +37,9 @@ jobs: - name: Create .env file if: ${{ steps.diff-check.outputs.diff == 'true' }} run: | - jq -r 'to_entries|map("\(.key)=\(.value|tostring)")|.[]' <<< "$vars" > .env - echo "$vars" + jq -r 'to_entries|map("\(.key)=\(.value|tostring)")|.[]' <<< "$VARS_CONTEXT" > .env env: - SECRETS_CONTEXT: ${{ toJson(secrets) }} + VARS_CONTEXT: ${{ toJson(vars) }} - name: Install Dependencies and Build if: ${{ steps.diff-check.outputs.diff == 'true' }}