Skip to content

Commit 5c42176

Browse files
soedirgosoedirgo
committed
Merge branch 'develop' into rs/add-supabase-etl-admin-user
2 parents d8c4918 + 4433e21 commit 5c42176

File tree

64 files changed

+921
-215
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+921
-215
lines changed

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

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,13 @@ jobs:
4040
run: |
4141
echo "sha=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
4242
43-
- uses: DeterminateSystems/nix-installer-action@main
43+
- name: Install nix
44+
uses: cachix/install-nix-action@v27
45+
with:
46+
install_url: https://releases.nixos.org/nix/nix-2.29.1/install
47+
extra_nix_config: |
48+
substituters = https://cache.nixos.org https://nix-postgres-artifacts.s3.amazonaws.com
49+
trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=% cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
4450
4551
- name: Set PostgreSQL version environment variable
4652
run: echo "POSTGRES_MAJOR_VERSION=${{ github.event.inputs.postgres_version }}" >> $GITHUB_ENV
@@ -57,18 +63,18 @@ jobs:
5763
env:
5864
POSTGRES_MAJOR_VERSION: ${{ env.POSTGRES_MAJOR_VERSION }}
5965
run: |
60-
packer init amazon-arm64-nix.pkr.hcl
6166
GIT_SHA=${{ steps.get_sha.outputs.sha }}
62-
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=-e postgresql_major=${POSTGRES_MAJOR_VERSION}" amazon-arm64-nix.pkr.hcl
67+
nix run github:supabase/postgres/${GIT_SHA}#packer -- init amazon-arm64-nix.pkr.hcl
68+
nix run github:supabase/postgres/${GIT_SHA}#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=-e postgresql_major=${POSTGRES_MAJOR_VERSION}" amazon-arm64-nix.pkr.hcl
6369
6470
- name: Build AMI stage 2
6571
env:
6672
POSTGRES_MAJOR_VERSION: ${{ env.POSTGRES_MAJOR_VERSION }}
6773
run: |
68-
packer init stage2-nix-psql.pkr.hcl
6974
GIT_SHA=${{ steps.get_sha.outputs.sha }}
75+
nix run github:supabase/postgres/${GIT_SHA}#packer -- init stage2-nix-psql.pkr.hcl
7076
POSTGRES_MAJOR_VERSION=${{ env.POSTGRES_MAJOR_VERSION }}
71-
packer build -var "git_sha=${GIT_SHA}" -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" stage2-nix-psql.pkr.hcl
77+
nix run github:supabase/postgres/${GIT_SHA}#packer -- build -var "git_sha=${GIT_SHA}" -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" stage2-nix-psql.pkr.hcl
7278
7379
- name: Grab release version
7480
id: process_release_version
@@ -103,6 +109,8 @@ jobs:
103109
- name: Upload nix flake revision to s3 staging
104110
run: |
105111
aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/20.04.tar.gz
112+
aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/24.04.tar.gz
113+
aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/upgrade_bundle.tar.gz
106114
107115
- name: configure aws credentials - prod
108116
uses: aws-actions/configure-aws-credentials@v4
@@ -122,6 +130,8 @@ jobs:
122130
- name: Upload nix flake revision to s3 prod
123131
run: |
124132
aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.PROD_ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/20.04.tar.gz
133+
aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.PROD_ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/24.04.tar.gz
134+
aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.PROD_ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/upgrade_bundle.tar.gz
125135
126136
- name: Create release
127137
uses: softprops/action-gh-release@v2

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

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,13 @@ jobs:
2424
- name: Checkout Repo
2525
uses: supabase/postgres/.github/actions/shared-checkout@HEAD
2626

27-
- uses: DeterminateSystems/nix-installer-action@main
27+
- name: Install nix
28+
uses: cachix/install-nix-action@v27
29+
with:
30+
install_url: https://releases.nixos.org/nix/nix-2.29.1/install
31+
extra_nix_config: |
32+
substituters = https://cache.nixos.org https://nix-postgres-artifacts.s3.amazonaws.com
33+
trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=% cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
2834
2935
- name: Set PostgreSQL versions
3036
id: set-versions
@@ -52,7 +58,14 @@ jobs:
5258
aws-region: "us-east-1"
5359
output-credentials: true
5460
role-duration-seconds: 7200
55-
- uses: DeterminateSystems/nix-installer-action@main
61+
62+
- name: Install nix
63+
uses: cachix/install-nix-action@v27
64+
with:
65+
install_url: https://releases.nixos.org/nix/nix-2.29.1/install
66+
extra_nix_config: |
67+
substituters = https://cache.nixos.org https://nix-postgres-artifacts.s3.amazonaws.com
68+
trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=% cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
5669
5770
- name: Run checks if triggered manually
5871
if: ${{ github.event_name == 'workflow_dispatch' }}
@@ -78,19 +91,19 @@ jobs:
7891
env:
7992
POSTGRES_MAJOR_VERSION: ${{ env.POSTGRES_MAJOR_VERSION }}
8093
run: |
81-
packer init amazon-arm64-nix.pkr.hcl
8294
GIT_SHA=${{github.sha}}
95+
nix run github:supabase/postgres/${GIT_SHA}#packer -- init amazon-arm64-nix.pkr.hcl
8396
# why is postgresql_major defined here instead of where the _three_ other postgresql_* variables are defined?
84-
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=-e postgresql_major=${POSTGRES_MAJOR_VERSION}" amazon-arm64-nix.pkr.hcl
97+
nix run github:supabase/postgres/${GIT_SHA}#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=-e postgresql_major=${POSTGRES_MAJOR_VERSION}" amazon-arm64-nix.pkr.hcl
8598
8699
- name: Build AMI stage 2
87100
env:
88101
POSTGRES_MAJOR_VERSION: ${{ env.POSTGRES_MAJOR_VERSION }}
89102
run: |
90-
packer init stage2-nix-psql.pkr.hcl
91103
GIT_SHA=${{github.sha}}
104+
nix run github:supabase/postgres/${GIT_SHA}#packer -- init stage2-nix-psql.pkr.hcl
92105
POSTGRES_MAJOR_VERSION=${{ env.POSTGRES_MAJOR_VERSION }}
93-
packer build -var "git_sha=${GIT_SHA}" -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" stage2-nix-psql.pkr.hcl
106+
nix run github:supabase/postgres/${GIT_SHA}#packer -- build -var "git_sha=${GIT_SHA}" -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" stage2-nix-psql.pkr.hcl
94107
95108
- name: Grab release version
96109
id: process_release_version
@@ -125,6 +138,8 @@ jobs:
125138
- name: Upload nix flake revision to s3 staging
126139
run: |
127140
aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/20.04.tar.gz
141+
aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/24.04.tar.gz
142+
aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/upgrade_bundle.tar.gz
128143
129144
- name: configure aws credentials - prod
130145
uses: aws-actions/configure-aws-credentials@v4
@@ -144,6 +159,8 @@ jobs:
144159
- name: Upload nix flake revision to s3 prod
145160
run: |
146161
aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.PROD_ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/20.04.tar.gz
162+
aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.PROD_ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/24.04.tar.gz
163+
aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.PROD_ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/upgrade_bundle.tar.gz
147164
148165
- name: Create release
149166
uses: softprops/action-gh-release@v2

‎.github/workflows/nix-build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ jobs:
8282
- name: Aggressive disk cleanup for DuckDB build
8383
if: matrix.runner == 'macos-latest-xlarge'
8484
run: |
85+
nix --version
8586
echo "=== BEFORE CLEANUP ==="
8687
df -h
8788
# Remove major space consumers
@@ -117,6 +118,8 @@ jobs:
117118
needs: build-run-image
118119
if: ${{ success() }}
119120
uses: ./.github/workflows/testinfra-ami-build.yml
121+
secrets:
122+
DEV_AWS_ROLE: ${{ secrets.DEV_AWS_ROLE }}
120123

121124
run-tests:
122125
needs: build-run-image

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ jobs:
6666

6767
- name: Upload pg_upgrade scripts to s3 staging
6868
run: |
69-
aws s3 cp /tmp/pg_upgrade_bin.tar.gz "s3://${{ secrets.ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/20.04.tar.gz"
69+
aws s3 cp /tmp/pg_upgrade_bin.tar.gz s3://${{ secrets.ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/20.04.tar.gz
70+
aws s3 cp /tmp/pg_upgrade_bin.tar.gz s3://${{ secrets.ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/24.04.tar.gz
71+
aws s3 cp /tmp/pg_upgrade_bin.tar.gz s3://${{ secrets.ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/upgrade_bundle.tar.gz
7072
7173
- name: Slack Notification on Failure
7274
if: ${{ failure() }}
@@ -113,7 +115,9 @@ jobs:
113115

114116
- name: Upload pg_upgrade scripts to s3 prod
115117
run: |
116-
aws s3 cp /tmp/pg_upgrade_bin.tar.gz "s3://${{ secrets.PROD_ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/20.04.tar.gz"
118+
aws s3 cp /tmp/pg_upgrade_bin.tar.gz s3://${{ secrets.PROD_ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/20.04.tar.gz
119+
aws s3 cp /tmp/pg_upgrade_bin.tar.gz s3://${{ secrets.PROD_ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/24.04.tar.gz
120+
aws s3 cp /tmp/pg_upgrade_bin.tar.gz s3://${{ secrets.PROD_ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/upgrade_bundle.tar.gz
117121
118122
- name: Slack Notification on Failure
119123
if: ${{ failure() }}

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,10 @@ jobs:
2626
- name: Checkout Repo
2727
uses: supabase/postgres/.github/actions/shared-checkout@HEAD
2828

29-
- uses: DeterminateSystems/nix-installer-action@main
30-
3129
- name: Set PostgreSQL versions - only builds pg17 atm
3230
id: set-versions
3331
run: |
34-
VERSIONS=$(nix run nixpkgs#yq -- '.postgres_major[1]' ansible/vars.yml | nix run nixpkgs#jq -- -R -s -c 'split("\n")[:-1]')
32+
VERSIONS=$(yq '.postgres_major[1]' ansible/vars.yml | jq -R -s -c 'split("\n")[:-1]')
3533
echo "postgres_versions=$VERSIONS" >> $GITHUB_OUTPUT
3634
3735
build:
@@ -55,7 +53,7 @@ jobs:
5553
- name: Run checks if triggered manually
5654
if: ${{ github.event_name == 'workflow_dispatch' }}
5755
run: |
58-
SUFFIX=$(sudo nix run nixpkgs#yq -- ".postgres_release[\"postgres${{ matrix.postgres_version }}\"]" ansible/vars.yml | sed -E 's/[0-9\.]+(.*)$/\1/')
56+
SUFFIX=$(yq ".postgres_release[\"postgres${{ matrix.postgres_version }}\"]" ansible/vars.yml | sed -E 's/[0-9\.]+(.*)$/\1/')
5957
if [[ -z $SUFFIX ]] ; then
6058
echo "Version must include non-numeric characters if built manually."
6159
exit 1
@@ -144,6 +142,16 @@ jobs:
144142
docker tag "postgres:$IMAGE_TAG" "$REGISTRY/$REPOSITORY:$IMAGE_TAG"
145143
docker push "$REGISTRY/$REPOSITORY:$IMAGE_TAG"
146144
145+
- name: Slack Notification on Failure
146+
if: ${{ failure() }}
147+
uses: rtCamp/action-slack-notify@v2
148+
env:
149+
SLACK_WEBHOOK: ${{ secrets.SLACK_NOTIFICATIONS_WEBHOOK }}
150+
SLACK_USERNAME: 'gha-failures-notifier'
151+
SLACK_COLOR: 'danger'
152+
SLACK_MESSAGE: 'Building Postgres QEMU artifact failed'
153+
SLACK_FOOTER: ''
154+
147155
- name: Cleanup resources after build
148156
if: ${{ always() }}
149157
run: |

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

Lines changed: 46 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@ name: Testinfra Integration Tests Nix
33
on:
44
workflow_dispatch:
55
workflow_call:
6+
secrets:
7+
DEV_AWS_ROLE:
8+
description: 'AWS role for dev environment'
9+
required: true
610

711
permissions:
8-
contents: read
12+
contents: write
913
id-token: write
1014

1115
jobs:
@@ -17,7 +21,13 @@ jobs:
1721
- name: Checkout Repo
1822
uses: supabase/postgres/.github/actions/shared-checkout@HEAD
1923

20-
- uses: DeterminateSystems/nix-installer-action@main
24+
- name: Install nix
25+
uses: cachix/install-nix-action@v27
26+
with:
27+
install_url: https://releases.nixos.org/nix/nix-2.29.1/install
28+
extra_nix_config: |
29+
substituters = https://cache.nixos.org https://nix-postgres-artifacts.s3.amazonaws.com
30+
trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=% cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
2131
2232
- name: Set PostgreSQL versions
2333
id: set-versions
@@ -32,22 +42,44 @@ jobs:
3242
matrix:
3343
postgres_version: ${{ fromJson(needs.prepare.outputs.postgres_versions) }}
3444
include:
35-
- runner: arm-runner
45+
- runner: large-linux-arm
3646
arch: arm64
37-
ubuntu_release: focal
38-
ubuntu_version: 20.04
47+
ubuntu_release: noble
48+
ubuntu_version: 24.04
3949
mcpu: neoverse-n1
4050
runs-on: ${{ matrix.runner }}
4151
timeout-minutes: 150
42-
permissions:
43-
contents: write
44-
packages: write
45-
id-token: write
4652

4753
steps:
4854
- name: Checkout Repo
4955
uses: supabase/postgres/.github/actions/shared-checkout@HEAD
5056

57+
- name: Debug AWS role secret
58+
run: |
59+
echo "Checking DEV_AWS_ROLE secret availability..."
60+
if [ -z "${{ secrets.DEV_AWS_ROLE }}" ]; then
61+
echo "❌ DEV_AWS_ROLE is empty or not available"
62+
else
63+
echo "✅ DEV_AWS_ROLE is available"
64+
fi
65+
66+
- name: Configure AWS credentials
67+
uses: aws-actions/configure-aws-credentials@v4
68+
with:
69+
role-to-assume: ${{ secrets.DEV_AWS_ROLE }}
70+
aws-region: "us-east-1"
71+
output-credentials: true
72+
role-duration-seconds: 7200
73+
74+
- name: Install nix
75+
uses: cachix/install-nix-action@v27
76+
with:
77+
install_url: https://releases.nixos.org/nix/nix-2.29.1/install
78+
extra_nix_config: |
79+
substituters = https://cache.nixos.org https://nix-postgres-artifacts.s3.amazonaws.com
80+
trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=% cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
81+
82+
5183
- id: args
5284
uses: mikefarah/yq@master
5385
with:
@@ -68,23 +100,23 @@ jobs:
68100

69101
- name: Generate common-nix.vars.pkr.hcl
70102
run: |
71-
PG_VERSION=$(sudo nix run nixpkgs#yq -- '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)
103+
PG_VERSION=$(nix run nixpkgs#yq -- '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)
72104
PG_VERSION=$(echo "$PG_VERSION" | tr -d '"') # Remove any surrounding quotes
73105
echo 'postgres-version = "'$PG_VERSION'"' > common-nix.vars.pkr.hcl
74106
# Ensure there's a newline at the end of the file
75107
echo "" >> common-nix.vars.pkr.hcl
76108
77109
- name: Build AMI stage 1
78110
run: |
79-
packer init amazon-arm64-nix.pkr.hcl
80111
GIT_SHA=${{github.sha}}
81-
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
112+
nix run github:supabase/postgres/${GIT_SHA}#packer -- init amazon-arm64-nix.pkr.hcl
113+
nix run github:supabase/postgres/${GIT_SHA}#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
82114
83115
- name: Build AMI stage 2
84116
run: |
85-
packer init stage2-nix-psql.pkr.hcl
86117
GIT_SHA=${{github.sha}}
87-
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
118+
nix run github:supabase/postgres/${GIT_SHA}#packer -- init stage2-nix-psql.pkr.hcl
119+
nix run github:supabase/postgres/${GIT_SHA}#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
88120
89121
- name: Run tests
90122
timeout-minutes: 10

‎Dockerfile-15

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ ARG index_advisor_release=0.2.0
3838
ARG supautils_release=2.2.0
3939
ARG wal_g_release=2.0.1
4040

41-
FROM ubuntu:focal as base
41+
FROM ubuntu:noble as base
4242

4343
RUN apt update -y && apt install -y \
4444
curl \

‎Dockerfile-17

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ARG index_advisor_release=0.2.0
3939
ARG supautils_release=2.2.0
4040
ARG wal_g_release=3.0.5
4141

42-
FROM ubuntu:focal as base
42+
FROM ubuntu:noble as base
4343

4444
RUN apt update -y && apt install -y \
4545
curl \

0 commit comments

Comments
 (0)