From 36b357c4cbf5336d2ce583ac96d6b2a6adc8a320 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Tue, 10 Dec 2024 12:11:33 -0500 Subject: [PATCH 1/2] chore: line up this branch to test in staging. --- .github/workflows/ami-release-nix.yml | 1 + ansible/vars.yml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ami-release-nix.yml b/.github/workflows/ami-release-nix.yml index 3242a4e1d..b380d75d0 100644 --- a/.github/workflows/ami-release-nix.yml +++ b/.github/workflows/ami-release-nix.yml @@ -5,6 +5,7 @@ on: branches: - develop - release/* + - sam/15-6-merge-staging paths: - '.github/workflows/ami-release-nix.yml' - 'common-nix.vars.pkr.hcl' diff --git a/ansible/vars.yml b/ansible/vars.yml index 9a336c44c..982ad0097 100644 --- a/ansible/vars.yml +++ b/ansible/vars.yml @@ -9,9 +9,9 @@ postgres_major: # Full version strings for each major version postgres_release: - postgresorioledb-17: "17.0.1.007-orioledb" - postgres15: "15.8.1.017" - postgres16: "16.3.1.023" + postgresorioledb-17: "17.0.1.007-orioledb-stage1" + postgres15: "15.8.1.017-stage-1" + postgres16: "16.3.1.023-stage-1" # Non Postgres Extensions pgbouncer_release: "1.19.0" From addd721353ca40af22a36d7afffe10af7596b5a6 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Tue, 10 Dec 2024 13:50:23 -0500 Subject: [PATCH 2/2] feat: also release upgrade scripts --- .github/workflows/publish-nix-pgupgrade-scripts.yml | 1 + ansible/vars.yml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-nix-pgupgrade-scripts.yml b/.github/workflows/publish-nix-pgupgrade-scripts.yml index a4aa4c3de..3be138ec7 100644 --- a/.github/workflows/publish-nix-pgupgrade-scripts.yml +++ b/.github/workflows/publish-nix-pgupgrade-scripts.yml @@ -5,6 +5,7 @@ on: branches: - develop - release/* + - sam/15-6-merge-staging paths: - '.github/workflows/publish-nix-pgupgrade-scripts.yml' workflow_dispatch: diff --git a/ansible/vars.yml b/ansible/vars.yml index 982ad0097..120977174 100644 --- a/ansible/vars.yml +++ b/ansible/vars.yml @@ -9,9 +9,9 @@ postgres_major: # Full version strings for each major version postgres_release: - postgresorioledb-17: "17.0.1.007-orioledb-stage1" - postgres15: "15.8.1.017-stage-1" - postgres16: "16.3.1.023-stage-1" + postgresorioledb-17: "17.0.1.007-orioledb-stage2" + postgres15: "15.8.1.017-stage-2" + postgres16: "16.3.1.023-stage-2" # Non Postgres Extensions pgbouncer_release: "1.19.0"