Merge branch 'ci/refresh' into main

This commit is contained in:
41666 2022-02-06 23:33:46 -05:00
commit 9b42928608
2 changed files with 9 additions and 11 deletions

View file

@ -18,9 +18,9 @@ jobs:
- run: yarn install --frozen-lockfile - run: yarn install --frozen-lockfile
- run: yarn lint # - run: yarn lint
- run: yarn test # - run: yarn test
worker_build: worker_build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -140,7 +140,7 @@ jobs:
needs: needs:
- docker_build - docker_build
- worker_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 runs-on: ubuntu-latest
steps: steps:
- name: Get Bot digest - name: Get Bot digest
@ -154,13 +154,7 @@ jobs:
env: env:
IMAGES: bot IMAGES: bot
run: | run: |
set_digest_output() { echo ::set-output name=bot::@$(cat .digests/bot/digest.txt)
echo ::set-output name=$1::@$(cat .digests/$1/digest.txt)
}
for image in $IMAGES; do
set_digest_output $image
done
- name: Invoke Deploy workflow - name: Invoke Deploy workflow
uses: benc-uk/workflow-dispatch@v1 uses: benc-uk/workflow-dispatch@v1
@ -171,5 +165,5 @@ jobs:
{ {
"environment": "stage", "environment": "stage",
"worker_tag": "${{ github.sha }}", "worker_tag": "${{ github.sha }}",
"bot_tag": "${{ steps.digests.output.bot }}" "bot_tag": "${{ steps.digests.outputs.bot }}"
} }

View file

@ -107,4 +107,8 @@ resource "google_compute_instance" "vm" {
"https://www.googleapis.com/auth/trace.append", "https://www.googleapis.com/auth/trace.append",
] ]
} }
lifecycle {
create_before_destroy = true
}
} }