chore: more setup for staging AMI

supabase · Oct 8, 2024 · 86ba8d8 · 86ba8d8
1 parent 9ad5b69
commit 86ba8d8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/ami-release-nix.yml b/.github/workflows/ami-release-nix.yml
@@ -30,7 +30,7 @@ jobs:
  - name: Set PostgreSQL versions
  id: set-versions
  run: |
- VERSIONS=$(nix run nixpkgs#yq -- eval '.postgres_major[]' ansible/vars.yml | jq -R -s -c 'split("\n")[:-1]')
+ VERSIONS=$(nix run nixpkgs#yq -- '.postgres_major[]' ansible/vars.yml | nix run nixpkgs#jq -- -R -s -c 'split("\n")[:-1]')
  echo "postgres_versions=$VERSIONS" >> $GITHUB_OUTPUT
 
  build:
@@ -64,7 +64,7 @@ jobs:
  - name: Run checks if triggered manually
  if: ${{ github.event_name == 'workflow_dispatch' }}
  run: |
- SUFFIX=$(nix run nixpkgs#yq -- eval '.postgres_release["postgres${{ matrix.postgres_version }}"]' ansible/vars.yml | sed -E 's/[0-9\.]+(.*)$/\1/')
+ SUFFIX=$(nix run nixpkgs#yq -- '.postgres_release["postgres${{ matrix.postgres_version }}"]' ansible/vars.yml | sed -E 's/[0-9\.]+(.*)$/\1/')
  if [[ -z $SUFFIX ]] ; then
  echo "Version must include non-numeric characters if built manually."
  exit 1
@@ -75,7 +75,7 @@ jobs:
 
  - name: Generate common-nix.vars.pkr.hcl
  run: |
- PG_VERSION=$(nix run nixpkgs#yq -- eval '.postgres_release["postgres${{ matrix.postgres_version }}"]' ansible/vars.yml)
+ PG_VERSION=$(nix run nixpkgs#yq -- '.postgres_release["postgres${{ matrix.postgres_version }}"]' ansible/vars.yml)
  echo "postgres-version = \"$PG_VERSION\"" > common-nix.vars.pkr.hcl
 
  - name: Build AMI stage 1

diff --git a/ansible/vars.yml b/ansible/vars.yml
@@ -11,8 +11,8 @@ postgres_major:
 
 # Full version strings for each major version
 postgres_release:
- postgres15: "15.8.1.003"
- postgres16: "16.3.1.000"
+ postgres15: "15.8.1.003-staging"
+ postgres16: "16.3.1.000-staging"
 
 # Non Postgres Extensions
 pgbouncer_release: "1.19.0"

diff --git a/stage2-nix-psql.pkr.hcl b/stage2-nix-psql.pkr.hcl
@@ -56,7 +56,7 @@ packer {
 }
 
 source "amazon-ebs" "ubuntu" {
- ami_name = "${var.ami_name}-${var.postgres-version}-staging"
+ ami_name = "${var.ami_name}-${var.postgres-version}"
  instance_type = "c6g.4xlarge"
  region = "${var.region}"
  source_ami_filter {