Skip to content

Commit c630680

Browse files
committed
ci: use larger runner for the test and testinfra-ami-build workflows
1 parent 4b77682 commit c630680

File tree

2 files changed

+6
-38
lines changed

2 files changed

+6
-38
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,12 @@ permissions:
1212

1313
jobs:
1414
prepare:
15-
runs-on: ubuntu-latest
15+
runs-on: large-linux-x86
1616
outputs:
1717
postgres_versions: ${{ steps.set-versions.outputs.postgres_versions }}
1818
steps:
1919
- name: Checkout Repo
2020
uses: supabase/postgres/.github/actions/shared-checkout@HEAD
21-
22-
- name: Clear Nix cache
23-
run: |
24-
sudo rm -rf /home/runner/.cache/nix
25-
2621
- uses: DeterminateSystems/nix-installer-action@main
2722
with:
2823
extra-conf: |
@@ -39,9 +34,9 @@ jobs:
3934
matrix:
4035
postgres_version: ${{ fromJson(needs.prepare.outputs.postgres_versions) }}
4136
include:
42-
- runner: ubuntu-22.04
37+
- runner: large-linux-x86
4338
arch: amd64
44-
- runner: ubuntu-22.04
39+
- runner: large-linux-arm
4540
arch: arm64
4641
runs-on: ${{ matrix.runner }}
4742
timeout-minutes: 180
@@ -51,9 +46,6 @@ jobs:
5146
steps:
5247
- name: Checkout Repo
5348
uses: supabase/postgres/.github/actions/shared-checkout@HEAD
54-
- name: Clear Nix cache
55-
run: |
56-
sudo rm -rf /home/runner/.cache/nix
5749
- uses: DeterminateSystems/nix-installer-action@main
5850
with:
5951
extra-conf: |

.github/workflows/testinfra-ami-build.yml

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,14 @@ permissions:
1010

1111
jobs:
1212
prepare:
13-
runs-on: ubuntu-latest
13+
runs-on: large-linux-x86
1414
outputs:
1515
postgres_versions: ${{ steps.set-versions.outputs.postgres_versions }}
1616
steps:
1717
- name: Checkout Repo
1818
uses: supabase/postgres/.github/actions/shared-checkout@HEAD
19-
20-
- uses: DeterminateSystems/nix-installer-action@main
2119

22-
- name: Clean Nix store before build
23-
run: |
24-
sudo nix-collect-garbage -d || true
25-
sudo nix-store --optimize || true
26-
df -h / # Display available space
20+
- uses: DeterminateSystems/nix-installer-action@main
2721

2822
- name: Set PostgreSQL versions
2923
id: set-versions
@@ -38,11 +32,7 @@ jobs:
3832
matrix:
3933
postgres_version: ${{ fromJson(needs.prepare.outputs.postgres_versions) }}
4034
include:
41-
- runner: arm-runner
42-
arch: arm64
43-
ubuntu_release: focal
44-
ubuntu_version: 20.04
45-
mcpu: neoverse-n1
35+
- runner: large-linux-arm
4636
runs-on: ${{ matrix.runner }}
4737
timeout-minutes: 150
4838
permissions:
@@ -87,26 +77,12 @@ jobs:
8777
GIT_SHA=${{github.sha}}
8878
packer build -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=${GITHUB_RUN_ID}" -var-file="development-arm.vars.pkr.hcl" -var-file="common-nix.vars.pkr.hcl" -var "ansible_arguments=" -var "postgres-version=${{ steps.random.outputs.random_string }}" -var "region=ap-southeast-1" -var 'ami_regions=["ap-southeast-1"]' -var "force-deregister=true" -var "ansible_arguments=-e postgresql_major=${POSTGRES_MAJOR_VERSION}" amazon-arm64-nix.pkr.hcl
8979
90-
- name: Clean up after AMI stage 1
91-
if: always() # Run even if previous steps fail
92-
run: |
93-
sudo nix-collect-garbage -d # Delete old generations of all profiles
94-
sudo rm -rf /tmp/* # Clean temporary files
95-
df -h / # Display available space
96-
9780
- name: Build AMI stage 2
9881
run: |
9982
packer init stage2-nix-psql.pkr.hcl
10083
GIT_SHA=${{github.sha}}
10184
packer build -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=${GITHUB_RUN_ID}" -var "postgres_major_version=${POSTGRES_MAJOR_VERSION}" -var-file="development-arm.vars.pkr.hcl" -var-file="common-nix.vars.pkr.hcl" -var "postgres-version=${{ steps.random.outputs.random_string }}" -var "region=ap-southeast-1" -var 'ami_regions=["ap-southeast-1"]' -var "force-deregister=true" -var "git_sha=${GITHUB_SHA}" stage2-nix-psql.pkr.hcl
10285
103-
- name: Clean up after AMI stage 2
104-
if: always() # Run even if previous steps fail
105-
run: |
106-
sudo nix-collect-garbage -d # Delete old generations of all profiles
107-
sudo rm -rf /tmp/* # Clean temporary files
108-
df -h / # Display available space
109-
11086
- name: Run tests
11187
timeout-minutes: 10
11288
env:

0 commit comments

Comments
 (0)