Skip to content

Commit 4a073c2

Browse files
authored
ci: fix CI regressions (#1655)
* ci: revert change to qemu image build workflow The workflow requires KVM on ARM. This is not available on the large GitHub Actions runners. We revert the change to the workflow. * ci: fix missing step to login to AWS after switching runner Since the runner was switched to a Github-hosted runner, we need to add a step to log in to AWS.
1 parent e9e60ba commit 4a073c2

File tree

3 files changed

+17
-4
lines changed

3 files changed

+17
-4
lines changed

.github/workflows/ami-release-nix-single.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ jobs:
2727
uses: supabase/postgres/.github/actions/shared-checkout@HEAD
2828
with:
2929
ref: ${{ github.event.inputs.branch }}
30+
- name: aws-creds
31+
uses: aws-actions/configure-aws-credentials@v4
32+
with:
33+
role-to-assume: ${{ secrets.DEV_AWS_ROLE }}
34+
aws-region: "us-east-1"
35+
output-credentials: true
36+
role-duration-seconds: 7200
3037

3138
- name: Get current branch SHA
3239
id: get_sha

.github/workflows/ami-release-nix.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,13 @@ jobs:
4545
steps:
4646
- name: Checkout Repo
4747
uses: supabase/postgres/.github/actions/shared-checkout@HEAD
48-
48+
- name: aws-creds
49+
uses: aws-actions/configure-aws-credentials@v4
50+
with:
51+
role-to-assume: ${{ secrets.DEV_AWS_ROLE }}
52+
aws-region: "us-east-1"
53+
output-credentials: true
54+
role-duration-seconds: 7200
4955
- uses: DeterminateSystems/nix-installer-action@main
5056

5157
- name: Run checks if triggered manually

.github/workflows/qemu-image-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ permissions:
1818

1919
jobs:
2020
prepare:
21-
runs-on: large-linux-x86
21+
runs-on: ubuntu-latest
2222
outputs:
2323
postgres_versions: ${{ steps.set-versions.outputs.postgres_versions }}
2424
steps:
@@ -38,7 +38,7 @@ jobs:
3838
strategy:
3939
matrix:
4040
postgres_version: ${{ fromJson(needs.prepare.outputs.postgres_versions) }}
41-
runs-on: large-linux-arm
41+
runs-on: arm-native-runner
4242
timeout-minutes: 150
4343
permissions:
4444
contents: write
@@ -54,7 +54,7 @@ jobs:
5454
- name: Run checks if triggered manually
5555
if: ${{ github.event_name == 'workflow_dispatch' }}
5656
run: |
57-
SUFFIX=$(nix run nixpkgs#yq -- ".postgres_release[\"postgres${{ matrix.postgres_version }}\"]" ansible/vars.yml | sed -E 's/[0-9\.]+(.*)$/\1/')
57+
SUFFIX=$(sudo nix run nixpkgs#yq -- ".postgres_release[\"postgres${{ matrix.postgres_version }}\"]" ansible/vars.yml | sed -E 's/[0-9\.]+(.*)$/\1/')
5858
if [[ -z $SUFFIX ]] ; then
5959
echo "Version must include non-numeric characters if built manually."
6060
exit 1

0 commit comments

Comments
 (0)