diff --git a/.github/workflows/ami-release-nix.yml b/.github/workflows/ami-release-nix.yml index 3242a4e1d..e528843d9 100644 --- a/.github/workflows/ami-release-nix.yml +++ b/.github/workflows/ami-release-nix.yml @@ -5,6 +5,7 @@ on: branches: - develop - release/* + - sam/publish-gh-actions paths: - '.github/workflows/ami-release-nix.yml' - 'common-nix.vars.pkr.hcl' diff --git a/.github/workflows/publish-nix-pgupgrade-scripts.yml b/.github/workflows/publish-nix-pgupgrade-scripts.yml index 6fb7f1830..de6f4e5ff 100644 --- a/.github/workflows/publish-nix-pgupgrade-scripts.yml +++ b/.github/workflows/publish-nix-pgupgrade-scripts.yml @@ -5,6 +5,13 @@ on: branches: - develop - release/* + paths: + - '.github/workflows/publish-nix-pgupgrade-scripts.yml' + - sam/publish-gh-actions + #TODO PR remove prior to merge + pull_request: + branches: + - sam/publish-gh-actions paths: - '.github/workflows/publish-nix-pgupgrade-scripts.yml' workflow_dispatch: @@ -49,7 +56,7 @@ jobs: - name: Grab release version id: process_release_version run: | - VERSION=$(sudo nix run nixpkgs#yq -- '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml) + VERSION=$(nix run nixpkgs#yq -- '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml) VERSION=$(echo $PG_VERSION | tr -d '"') # Remove any surrounding quotes if [[ "${{ inputs.postgresVersion }}" != "" ]]; then VERSION=${{ inputs.postgresVersion }} @@ -95,11 +102,13 @@ jobs: steps: - name: Checkout Repo uses: actions/checkout@v3 - + + - uses: DeterminateSystems/nix-installer-action@main + - name: Grab release version id: process_release_version run: | - VERSION=$(sudo nix run nixpkgs#yq -- '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml) + VERSION=$(nix run nixpkgs#yq -- '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml) VERSION=$(echo $PG_VERSION | tr -d '"') # Remove any surrounding quotes if [[ "${{ inputs.postgresVersion }}" != "" ]]; then VERSION=${{ inputs.postgresVersion }} diff --git a/ansible/vars.yml b/ansible/vars.yml index d059b5f58..d3dae5a3f 100644 --- 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.010" - postgres16: "16.3.1.016" + postgres15: "15.8.1.010-staging" + postgres16: "16.3.1.016-staging" # Non Postgres Extensions pgbouncer_release: "1.19.0"