From 790bc3ec63e7f8aef868f4853f14f2951ee14553 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Tue, 5 May 2026 14:57:18 -0400 Subject: [PATCH 1/4] feat: refine when certain workflows are run --- .github/workflows/check-shellscripts.yml | 3 +++ .github/workflows/ci.yml | 3 +++ .github/workflows/nix-build.yml | 16 ++++++++++++++++ 3 files changed, 22 insertions(+) diff --git a/.github/workflows/check-shellscripts.yml b/.github/workflows/check-shellscripts.yml index 1a7e4db2c7..72b29ab2d5 100644 --- a/.github/workflows/check-shellscripts.yml +++ b/.github/workflows/check-shellscripts.yml @@ -2,6 +2,9 @@ name: Check shell scripts on: pull_request: + paths: + - 'ansible/files/admin_api_scripts/**' + - '.github/workflows/check-shellscripts.yml' merge_group: workflow_dispatch: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 602268a13f..2e1e85b489 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,6 +2,9 @@ name: Check merge requirements on: pull_request: + paths: + - 'ansible/vars.yml' + - '.github/workflows/ci.yml' merge_group: permissions: diff --git a/.github/workflows/nix-build.yml b/.github/workflows/nix-build.yml index f45e5d1e12..1b9718ef4a 100644 --- a/.github/workflows/nix-build.yml +++ b/.github/workflows/nix-build.yml @@ -5,6 +5,22 @@ on: branches: - release/* pull_request: + paths: + - 'flake.nix' + - 'flake.lock' + - 'nix/**' + - 'ansible/files/**' + - 'ansible/vars.yml' + - 'migrations/**' + - 'audit-specs/**' + - 'Dockerfile-*' + - 'docker/**' + - '.github/workflows/nix-build.yml' + - '.github/workflows/nix-eval.yml' + - '.github/workflows/test.yml' + - '.github/workflows/testinfra-ami-build.yml' + - '.github/workflows/docker-image-test.yml' + - '.github/actions/**' merge_group: workflow_dispatch: From f7186753a3f1cd5b492708b75f9b89f79b2b89fb Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Tue, 5 May 2026 15:54:44 -0400 Subject: [PATCH 2/4] fix: tighten filter --- .github/workflows/nix-build.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nix-build.yml b/.github/workflows/nix-build.yml index 1b9718ef4a..ea27701a4e 100644 --- a/.github/workflows/nix-build.yml +++ b/.github/workflows/nix-build.yml @@ -17,10 +17,9 @@ on: - 'docker/**' - '.github/workflows/nix-build.yml' - '.github/workflows/nix-eval.yml' - - '.github/workflows/test.yml' - - '.github/workflows/testinfra-ami-build.yml' - - '.github/workflows/docker-image-test.yml' - - '.github/actions/**' + - '.github/actions/nix-install-ephemeral/**' + - '.github/actions/nix-install-self-hosted/**' + - '.github/actions/nix-build-retry/**' merge_group: workflow_dispatch: From d22916d0c951397c32deb793591e9149875fb9d6 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Tue, 5 May 2026 16:56:39 -0400 Subject: [PATCH 3/4] fix: we don't need to trigger nix build based on change to ansible/vars.yml --- .github/workflows/nix-build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/nix-build.yml b/.github/workflows/nix-build.yml index ea27701a4e..dc577095dd 100644 --- a/.github/workflows/nix-build.yml +++ b/.github/workflows/nix-build.yml @@ -10,7 +10,6 @@ on: - 'flake.lock' - 'nix/**' - 'ansible/files/**' - - 'ansible/vars.yml' - 'migrations/**' - 'audit-specs/**' - 'Dockerfile-*' From b9121beeccf2322f964f110e09c145d8e12cd833 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Tue, 5 May 2026 20:34:11 -0400 Subject: [PATCH 4/4] chore: suffix to test --- ansible/vars.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/vars.yml b/ansible/vars.yml index 252862dd50..89bfcdd962 100644 --- a/ansible/vars.yml +++ b/ansible/vars.yml @@ -10,9 +10,9 @@ postgres_major: # Full version strings for each major version postgres_release: - postgresorioledb-17: "17.6.0.072-orioledb" - postgres17: "17.6.1.115" - postgres15: "15.14.1.115" + postgresorioledb-17: "17.6.0.071-orioledb-ci-1" + postgres17: "17.6.1.114-ci-1" + postgres15: "15.14.1.114-ci-1" # Non Postgres Extensions pgbouncer_release: 1.25.1