From d116caccf223f1ac4c668c042610b8cf640d9a7e Mon Sep 17 00:00:00 2001 From: Katalina Okano Date: Sun, 6 Feb 2022 22:46:59 -0500 Subject: [PATCH 1/5] debug some stuff --- .github/workflows/build.yml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4222bd3..1a86b12 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,9 +18,9 @@ jobs: - run: yarn install --frozen-lockfile - - run: yarn lint + # - run: yarn lint - - run: yarn test + # - run: yarn test worker_build: runs-on: ubuntu-latest @@ -134,6 +134,22 @@ jobs: with: name: ${{ matrix.dockerfile }}-digest path: digest.txt + trigger_deploy_test: + name: Test Deploy Artifacts + needs: + - docker_build + runs-on: ubuntu-latest + steps: + - name: Get Bot digest + uses: actions/download-artifact@v2 + with: + name: bot-digest + path: .digests/bot + - run: | + ls .digests + ls .digests/bot + cat .digests/bot + cat .digests/bot/* trigger_deploy: name: Deploy to Stage From 06737f4bc77823bd808915a99b4bf18d51d80775 Mon Sep 17 00:00:00 2001 From: Katalina Okano Date: Sun, 6 Feb 2022 22:56:44 -0500 Subject: [PATCH 2/5] remove debug, but reduce meta-ing the docker digest --- .github/workflows/build.yml | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1a86b12..6cbc64c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -134,29 +134,13 @@ jobs: with: name: ${{ matrix.dockerfile }}-digest path: digest.txt - trigger_deploy_test: - name: Test Deploy Artifacts - needs: - - docker_build - runs-on: ubuntu-latest - steps: - - name: Get Bot digest - uses: actions/download-artifact@v2 - with: - name: bot-digest - path: .digests/bot - - run: | - ls .digests - ls .digests/bot - cat .digests/bot - cat .digests/bot/* trigger_deploy: name: Deploy to Stage needs: - docker_build - worker_build - if: github.ref == 'refs/heads/main' + if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/ci/refresh' runs-on: ubuntu-latest steps: - name: Get Bot digest @@ -170,13 +154,7 @@ jobs: env: IMAGES: bot run: | - set_digest_output() { - echo ::set-output name=$1::@$(cat .digests/$1/digest.txt) - } - - for image in $IMAGES; do - set_digest_output $image - done + echo ::set-output name=$1::@$(cat .digests/bot/digest.txt) - name: Invoke Deploy workflow uses: benc-uk/workflow-dispatch@v1 From 6f3f805b4ad431426f1cfb1ab83ca508acfacf42 Mon Sep 17 00:00:00 2001 From: Katalina Okano Date: Sun, 6 Feb 2022 22:59:34 -0500 Subject: [PATCH 3/5] set name of output --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6cbc64c..9a056b4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -154,7 +154,7 @@ jobs: env: IMAGES: bot run: | - echo ::set-output name=$1::@$(cat .digests/bot/digest.txt) + echo ::set-output name=bot::@$(cat .digests/bot/digest.txt) - name: Invoke Deploy workflow uses: benc-uk/workflow-dispatch@v1 From 54abcaeaa7fe8c51bcc2f0ca615d5d69eb30e8d6 Mon Sep 17 00:00:00 2001 From: Katalina Okano Date: Sun, 6 Feb 2022 23:11:49 -0500 Subject: [PATCH 4/5] potentially ancient typo?? --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9a056b4..7038f2e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -165,5 +165,5 @@ jobs: { "environment": "stage", "worker_tag": "${{ github.sha }}", - "bot_tag": "${{ steps.digests.output.bot }}" + "bot_tag": "${{ steps.digests.outputs.bot }}" } From c0a11fc9eeb88b434d00832ef5eec9a88255cf58 Mon Sep 17 00:00:00 2001 From: Katalina Okano Date: Sun, 6 Feb 2022 23:18:38 -0500 Subject: [PATCH 5/5] create before destroy --- terraform/bot.tf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/terraform/bot.tf b/terraform/bot.tf index a7848ba..c97edd0 100644 --- a/terraform/bot.tf +++ b/terraform/bot.tf @@ -107,4 +107,8 @@ resource "google_compute_instance" "vm" { "https://www.googleapis.com/auth/trace.append", ] } + + lifecycle { + create_before_destroy = true + } }