Skip to content

Commit a9b2b23

Browse files
tomashleytomashley
committed
Merge branch 'develop' into tom/ansible/gandalf
2 parents e09505f + 7d78f14 commit a9b2b23

13 files changed

+162
-85
lines changed

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,21 @@ permissions:
1919

2020
jobs:
2121
build:
22-
runs-on: arm-runner
22+
runs-on: large-linux-arm
2323
timeout-minutes: 150
2424

2525
steps:
2626
- name: Checkout Repo
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
@@ -40,7 +47,7 @@ jobs:
4047

4148
- name: Generate common-nix.vars.pkr.hcl
4249
run: |
43-
PG_VERSION=$(sudo nix run nixpkgs#yq -- '.postgres_release["postgres'${{ env.POSTGRES_MAJOR_VERSION }}'"]' ansible/vars.yml)
50+
PG_VERSION=$(nix run nixpkgs#yq -- '.postgres_release["postgres'${{ env.POSTGRES_MAJOR_VERSION }}'"]' ansible/vars.yml)
4451
PG_VERSION=$(echo "$PG_VERSION" | tr -d '"') # Remove any surrounding quotes
4552
echo 'postgres-version = "'$PG_VERSION'"' > common-nix.vars.pkr.hcl
4653
# Ensure there's a newline at the end of the file

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

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ permissions:
1717

1818
jobs:
1919
prepare:
20-
runs-on: ubuntu-latest
20+
runs-on: large-linux-x86
2121
outputs:
2222
postgres_versions: ${{ steps.set-versions.outputs.postgres_versions }}
2323
steps:
@@ -38,24 +38,26 @@ jobs:
3838
matrix:
3939
postgres_version: ${{ fromJson(needs.prepare.outputs.postgres_versions) }}
4040
include:
41-
- runner: arm-runner
42-
arch: arm64
43-
ubuntu_release: focal
44-
ubuntu_version: 20.04
45-
mcpu: neoverse-n1
41+
- runner: large-linux-arm
4642
runs-on: ${{ matrix.runner }}
4743
timeout-minutes: 150
4844

4945
steps:
5046
- name: Checkout Repo
5147
uses: supabase/postgres/.github/actions/shared-checkout@HEAD
52-
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
5355
- uses: DeterminateSystems/nix-installer-action@main
5456

5557
- name: Run checks if triggered manually
5658
if: ${{ github.event_name == 'workflow_dispatch' }}
5759
run: |
58-
SUFFIX=$(sudo nix run nixpkgs#yq -- ".postgres_release[\"postgres${{ matrix.postgres_version }}\"]" ansible/vars.yml | sed -E 's/[0-9\.]+(.*)$/\1/')
60+
SUFFIX=$(nix run nixpkgs#yq -- ".postgres_release[\"postgres${{ matrix.postgres_version }}\"]" ansible/vars.yml | sed -E 's/[0-9\.]+(.*)$/\1/')
5961
if [[ -z "$SUFFIX" ]] ; then
6062
echo "Version must include non-numeric characters if built manually."
6163
exit 1
@@ -66,7 +68,7 @@ jobs:
6668

6769
- name: Generate common-nix.vars.pkr.hcl
6870
run: |
69-
PG_VERSION=$(sudo nix run nixpkgs#yq -- '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)
71+
PG_VERSION=$(nix run nixpkgs#yq -- '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)
7072
PG_VERSION=$(echo "$PG_VERSION" | tr -d '"') # Remove any surrounding quotes
7173
echo 'postgres-version = "'$PG_VERSION'"' > common-nix.vars.pkr.hcl
7274
# Ensure there's a newline at the end of the file

‎.github/workflows/dockerhub-release-matrix.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ permissions:
1616

1717
jobs:
1818
prepare:
19-
runs-on: ubuntu-latest
19+
runs-on: large-linux-x86
2020
outputs:
2121
matrix_config: ${{ steps.set-matrix.outputs.matrix_config }}
2222
steps:
@@ -49,7 +49,7 @@ jobs:
4949
needs: prepare
5050
strategy:
5151
matrix: ${{ fromJson(needs.prepare.outputs.matrix_config) }}
52-
runs-on: ubuntu-latest
52+
runs-on: large-linux-x86
5353
outputs:
5454
build_args: ${{ steps.args.outputs.result }}
5555
steps:
@@ -75,7 +75,7 @@ jobs:
7575
matrix:
7676
postgres: ${{ fromJson(needs.prepare.outputs.matrix_config).include }}
7777
arch: [amd64, arm64]
78-
runs-on: ${{ matrix.arch == 'amd64' && 'ubuntu-latest' || 'arm-runner' }}
78+
runs-on: ${{ matrix.arch == 'amd64' && 'large-linux-x86' || 'large-linux-arm' }}
7979
timeout-minutes: 180
8080
steps:
8181
- name: Checkout Repo
@@ -93,7 +93,7 @@ jobs:
9393
id: image
9494
run: |
9595
if [[ "${{ matrix.arch }}" == "arm64" ]]; then
96-
pg_version=$(sudo nix run nixpkgs#nushell -- -c '
96+
pg_version=$(nix run nixpkgs#nushell -- -c '
9797
let version = "${{ matrix.postgres.version }}"
9898
let release_key = if ($version | str contains "orioledb") {
9999
$"postgresorioledb-17"
@@ -132,7 +132,7 @@ jobs:
132132
strategy:
133133
matrix:
134134
include: ${{ fromJson(needs.prepare.outputs.matrix_config).include }}
135-
runs-on: ubuntu-latest
135+
runs-on: large-linux-x86
136136
steps:
137137
- name: Checkout Repo
138138
uses: supabase/postgres/.github/actions/shared-checkout@HEAD
@@ -176,7 +176,7 @@ jobs:
176176
${{ steps.get_version.outputs.pg_version }}_arm64
177177
combine_results:
178178
needs: [prepare, merge_manifest]
179-
runs-on: ubuntu-latest
179+
runs-on: large-linux-x86
180180
steps:
181181
- name: Checkout Repo
182182
uses: supabase/postgres/.github/actions/shared-checkout@HEAD

‎.github/workflows/manual-docker-release.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions:
1313

1414
jobs:
1515
prepare:
16-
runs-on: ubuntu-latest
16+
runs-on: large-linux-x86
1717
outputs:
1818
matrix_config: ${{ steps.set-matrix.outputs.matrix_config }}
1919
steps:
@@ -46,7 +46,7 @@ jobs:
4646
needs: prepare
4747
strategy:
4848
matrix: ${{ fromJson(needs.prepare.outputs.matrix_config) }}
49-
runs-on: ubuntu-latest
49+
runs-on: large-linux-x86
5050
outputs:
5151
build_args: ${{ steps.args.outputs.result }}
5252
steps:
@@ -72,7 +72,7 @@ jobs:
7272
matrix:
7373
postgres: ${{ fromJson(needs.prepare.outputs.matrix_config).include }}
7474
arch: [amd64, arm64]
75-
runs-on: ${{ matrix.arch == 'amd64' && 'ubuntu-latest' || 'arm-runner' }}
75+
runs-on: ${{ matrix.arch == 'amd64' && 'large-linux-x86' || 'large-linux-arm' }}
7676
timeout-minutes: 180
7777
steps:
7878
- name: Checkout Repo
@@ -90,7 +90,7 @@ jobs:
9090
id: image
9191
run: |
9292
if [[ "${{ matrix.arch }}" == "arm64" ]]; then
93-
pg_version=$(sudo nix run nixpkgs#nushell -- -c '
93+
pg_version=$(nix run nixpkgs#nushell -- -c '
9494
let version = "${{ matrix.postgres.version }}"
9595
let release_key = if ($version | str contains "orioledb") {
9696
$"postgresorioledb-17"
@@ -141,7 +141,7 @@ jobs:
141141
strategy:
142142
matrix:
143143
include: ${{ fromJson(needs.prepare.outputs.matrix_config).include }}
144-
runs-on: ubuntu-latest
144+
runs-on: large-linux-x86
145145
steps:
146146
- name: Checkout Repo
147147
uses: supabase/postgres/.github/actions/shared-checkout@HEAD
@@ -185,7 +185,7 @@ jobs:
185185
${{ steps.get_version.outputs.pg_version }}_arm64
186186
combine_results:
187187
needs: [prepare, merge_manifest]
188-
runs-on: ubuntu-latest
188+
runs-on: large-linux-x86
189189
steps:
190190
- name: Checkout Repo
191191
uses: supabase/postgres/.github/actions/shared-checkout@HEAD

‎.github/workflows/nix-build.yml‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ on:
99
workflow_dispatch:
1010

1111
permissions:
12-
contents: read
13-
id-token: write
14-
12+
id-token: write
13+
# required by testinfra-ami-build dependent workflows
14+
contents: write
15+
packages: write
16+
1517
jobs:
1618
build-run-image:
1719
strategy:
@@ -37,21 +39,27 @@ jobs:
3739
aws-region: "us-east-1"
3840
output-credentials: true
3941
role-duration-seconds: 7200
42+
- name: Setup AWS credentials for Nix
43+
if: ${{ github.secret_source == 'Actions' }}
44+
run: |
45+
sudo -H aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID
46+
sudo -H aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY
47+
sudo -H aws configure set aws_session_token $AWS_SESSION_TOKEN
4048
- name: write secret key
4149
# use python so we don't interpolate the secret into the workflow logs, in case of bugs
4250
run: |
43-
python -c "import os; file = open('nix-secret-key', 'w'); file.write(os.environ['NIX_SIGN_SECRET_KEY']); file.close()"
51+
sudo mkdir -p /etc/nix
52+
sudo -E python -c "import os; file = open('/etc/nix/nix-secret-key', 'w'); file.write(os.environ['NIX_SIGN_SECRET_KEY']); file.close()"
4453
env:
4554
NIX_SIGN_SECRET_KEY: ${{ secrets.NIX_SIGN_SECRET_KEY }}
4655
- name: Setup cache script
4756
if: ${{ github.secret_source == 'Actions' }}
4857
run: |
49-
sudo mkdir -p /etc/nix
5058
cat << 'EOF' | sudo tee /etc/nix/upload-to-cache.sh > /dev/null
5159
#!/usr/bin/env bash
5260
set -eouf
5361
export IFS=' '
54-
echo /nix/var/nix/profiles/default/bin/nix copy --to 's3://nix-postgres-artifacts?secret-key=nix-secret-key' \$OUT_PATHS
62+
/nix/var/nix/profiles/default/bin/nix copy --to 's3://nix-postgres-artifacts?secret-key=/etc/nix/nix-secret-key' $OUT_PATHS
5563
EOF
5664
sudo chmod +x /etc/nix/upload-to-cache.sh
5765
- name: Install nix
@@ -78,3 +86,13 @@ jobs:
7886
AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}
7987
AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }}
8088
AWS_SESSION_TOKEN: ${{ env.AWS_SESSION_TOKEN }}
89+
90+
run-testinfra:
91+
needs: build-run-image
92+
if: ${{ success() }}
93+
uses: ./.github/workflows/testinfra-ami-build.yml
94+
95+
run-tests:
96+
needs: build-run-image
97+
if: ${{ success() }}
98+
uses: ./.github/workflows/test.yml

‎.github/workflows/publish-migrations-prod.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55

66
jobs:
77
build:
8-
runs-on: [self-hosted, linux]
8+
runs-on: large-linux-arm
99
timeout-minutes: 15
1010
permissions:
1111
id-token: write

‎.github/workflows/publish-migrations-staging.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
build:
11-
runs-on: [self-hosted, linux]
11+
runs-on: large-linux-arm
1212
timeout-minutes: 15
1313
permissions:
1414
id-token: write

‎.github/workflows/publish-nix-pgupgrade-bin-flake-version.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ 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:
@@ -29,7 +29,7 @@ jobs:
2929
3030
publish-staging:
3131
needs: prepare
32-
runs-on: ubuntu-latest
32+
runs-on: large-linux-x86
3333
strategy:
3434
matrix:
3535
postgres_version: ${{ fromJson(needs.prepare.outputs.postgres_versions) }}
@@ -79,7 +79,7 @@ jobs:
7979
SLACK_FOOTER: ''
8080

8181
publish-prod:
82-
runs-on: ubuntu-latest
82+
runs-on: large-linux-x86
8383
if: github.ref_name == 'develop' || contains( github.ref, 'release' )
8484
needs: prepare
8585
strategy:
@@ -93,7 +93,7 @@ jobs:
9393
- name: Grab release version
9494
id: process_release_version
9595
run: |
96-
VERSION=$(sudo nix run nixpkgs#yq -- '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)
96+
VERSION=$(nix run nixpkgs#yq -- '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)
9797
VERSION=$(echo $VERSION | tr -d '"') # Remove any surrounding quotes
9898
echo "version=$VERSION" >> "$GITHUB_OUTPUT"
9999
echo "major_version=$(echo $VERSION | cut -d'.' -f1)" >> "$GITHUB_OUTPUT"

‎.github/workflows/publish-nix-pgupgrade-scripts.yml‎

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

2020
jobs:
2121
prepare:
22-
runs-on: ubuntu-latest
22+
runs-on: large-linux-x86
2323
outputs:
2424
postgres_versions: ${{ steps.set-versions.outputs.postgres_versions }}
2525
steps:
@@ -36,7 +36,7 @@ jobs:
3636
3737
publish-staging:
3838
needs: prepare
39-
runs-on: ubuntu-latest
39+
runs-on: large-linux-x86
4040
strategy:
4141
matrix:
4242
postgres_version: ${{ fromJson(needs.prepare.outputs.postgres_versions) }}
@@ -84,7 +84,7 @@ jobs:
8484
SLACK_FOOTER: ''
8585
publish-prod:
8686
needs: prepare
87-
runs-on: ubuntu-latest
87+
runs-on: large-linux-x86
8888
if: github.ref_name == 'develop' || contains( github.ref, 'release' )
8989

9090
strategy:

‎.github/workflows/test.yml‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,20 @@
11
name: Test Database
22
on:
3-
push:
4-
branches:
5-
- develop
6-
pull_request:
73
workflow_dispatch:
4+
workflow_call:
85

96
permissions:
107
contents: read
118
id-token: write
129

1310
jobs:
1411
prepare:
15-
runs-on: ubuntu-latest
12+
runs-on: large-linux-x86
1613
outputs:
1714
postgres_versions: ${{ steps.set-versions.outputs.postgres_versions }}
1815
steps:
1916
- name: Checkout Repo
2017
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-
2618
- uses: DeterminateSystems/nix-installer-action@main
2719
with:
2820
extra-conf: |
@@ -39,9 +31,9 @@ jobs:
3931
matrix:
4032
postgres_version: ${{ fromJson(needs.prepare.outputs.postgres_versions) }}
4133
include:
42-
- runner: ubuntu-22.04
34+
- runner: large-linux-x86
4335
arch: amd64
44-
- runner: ubuntu-22.04
36+
- runner: large-linux-arm
4537
arch: arm64
4638
runs-on: ${{ matrix.runner }}
4739
timeout-minutes: 180
@@ -51,9 +43,6 @@ jobs:
5143
steps:
5244
- name: Checkout Repo
5345
uses: supabase/postgres/.github/actions/shared-checkout@HEAD
54-
- name: Clear Nix cache
55-
run: |
56-
sudo rm -rf /home/runner/.cache/nix
5746
- uses: DeterminateSystems/nix-installer-action@main
5847
with:
5948
extra-conf: |

0 commit comments

Comments
 (0)