From 9bf7c13d80e0a15c792e0a0d739f161cb2b7ffdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= Date: Wed, 23 Aug 2023 16:40:11 +0200 Subject: [PATCH 1/3] Update prod.yml --- .github/workflows/prod.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml index 4133f81ce..24dec5785 100644 --- a/.github/workflows/prod.yml +++ b/.github/workflows/prod.yml @@ -11,8 +11,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - - uses: superfly/flyctl-actions@1.4 - with: - args: "-c deploy/fly/prod.toml deploy --build-arg SLOT_NAME_SUFFIX=${GITHUB_SHA::7}" + - uses: superfly/flyctl-actions/setup-flyctl@1.4 + - run: "flyctl -c deploy/fly/prod.toml deploy --build-arg SLOT_NAME_SUFFIX=${GITHUB_SHA::7}" env: - FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }} \ No newline at end of file + FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }} From 4b5228061ed0b478266f4249af8e5711c3eb6fe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= Date: Wed, 23 Aug 2023 16:42:16 +0200 Subject: [PATCH 2/3] Update staging.yml --- .github/workflows/staging.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 389906bae..c11ec34fe 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -11,6 +11,5 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: superfly/flyctl-actions@1.4 - with: - args: "-c deploy/fly/staging.toml deploy --build-arg SLOT_NAME_SUFFIX=${GITHUB_SHA::7}" + - uses: superfly/flyctl-actions/setup-flyctl@1.4 + - run: "flyctl -c deploy/fly/staging.toml deploy --build-arg SLOT_NAME_SUFFIX=${GITHUB_SHA::7}" From be611365961bf23066eb731f4336b1ca770a7075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= Date: Wed, 23 Aug 2023 16:44:33 +0200 Subject: [PATCH 3/3] Update staging_supabench.yml --- .github/workflows/staging_supabench.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/staging_supabench.yml b/.github/workflows/staging_supabench.yml index cc3a6cca5..502a05489 100644 --- a/.github/workflows/staging_supabench.yml +++ b/.github/workflows/staging_supabench.yml @@ -11,16 +11,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: superfly/flyctl-actions@1.4 - with: - args: "-c deploy/fly/qa.toml scale count 1" - - uses: superfly/flyctl-actions@1.4 - with: - args: "-c deploy/fly/qa.toml deploy --build-arg SLOT_NAME_SUFFIX=${GITHUB_SHA::7}" - - uses: superfly/flyctl-actions@1.4 - if: always() - with: - args: "-c deploy/fly/qa.toml scale count 0" + - uses: superfly/flyctl-actions/setup-flyctl@1.4 + - run: "flyctl -c deploy/fly/qa.toml scale count 1" + - run: "flyctl -c deploy/fly/qa.toml deploy --build-arg SLOT_NAME_SUFFIX=${GITHUB_SHA::7}" + - run: "flyctl -c deploy/fly/qa.toml scale count 0" - name: Get PR into variable run: echo "PR_NUM=$(git show -s --format=%s | grep -Po '(?<=#)[0-9]*')" >> $GITHUB_ENV - name: Start Supabench