From 35c43726d6b398e2ccec4bc3f24fa3836c5be8fe Mon Sep 17 00:00:00 2001 From: Bartek Tofel Date: Wed, 18 Mar 2026 12:14:33 +0100 Subject: [PATCH 1/3] use 'every' quantifier for dorny-paths --- .../workflows/integration-in-memory-tests.yml | 17 ++++++++--------- .github/workflows/integration-tests.yml | 6 +++++- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/integration-in-memory-tests.yml b/.github/workflows/integration-in-memory-tests.yml index a409b3560b2..3b7e33646f9 100644 --- a/.github/workflows/integration-in-memory-tests.yml +++ b/.github/workflows/integration-in-memory-tests.yml @@ -30,9 +30,7 @@ jobs: # We don't directly merge dependabot PRs, so let's not waste the resources if: github.actor != 'dependabot[bot]' outputs: - github_ci_changes: ${{ steps.ignore-filter.outputs.changes || steps.changes.outputs.github_ci_changes }} - core_changes: ${{ steps.ignore-filter.outputs.changes || steps.changes.outputs.core_changes }} - ccip_changes: ${{ steps.ignore-filter.outputs.changes || steps.changes.outputs.ccip_changes }} + changes: ${{ steps.ignore-filter.outputs.changes || steps.changes.outputs.changes }} should_use_self_hosted_runner: ${{ steps.label-runs-on-opt-out.outputs.check-label-found == 'false' }} steps: - name: Checkout the repo @@ -45,19 +43,20 @@ jobs: - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2 id: changes with: + predicate-quantifier: "every" filters: | - github_ci_changes: + changes: - '.github/workflows/integration-in-memory-tests.yml' - '.github/integration-in-memory-tests.yml' - core_changes: - '**/*.go' - '**/*go.sum' - '**/*go.mod' - '**/*Dockerfile' - 'core/**/migrations/*.sql' - 'core/**/config/**/*.toml' - - 'integration-tests/**/*.toml' - ccip_changes: + - '!system-tests/**' + - '!devenv/**' + - '!core/scripts/cre/**' - '**/*ccip*' - '**/*ccip*/**' @@ -81,7 +80,7 @@ jobs: id-token: write contents: read needs: changes - if: github.event_name == 'pull_request' && ( needs.changes.outputs.ccip_changes == 'true' || needs.changes.outputs.core_changes == 'true' || needs.changes.outputs.github_ci_changes == 'true') + if: github.event_name == 'pull_request' && needs.changes.outputs.changes == 'true' uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@78642e9937e8154e65f30461a99a7099c953d35f # 2026-03-12 with: workflow_name: Run CCIP Integration Tests For PR @@ -113,7 +112,7 @@ jobs: id-token: write contents: read needs: changes - if: github.event_name == 'merge_group' && ( needs.changes.outputs.ccip_changes == 'true' || needs.changes.outputs.core_changes == 'true' || needs.changes.outputs.github_ci_changes == 'true') + if: github.event_name == 'merge_group' && needs.changes.outputs.changes == 'true' uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@78642e9937e8154e65f30461a99a7099c953d35f # 2026-03-12 with: workflow_name: Run CCIP Integration Tests For Merge Queue diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index fca488c30dc..8b9c23a8553 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -108,6 +108,7 @@ jobs: - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2 id: changes with: + predicate-quantifier: "every" filters: | general_changes: - '.github/workflows/integration-tests.yml' @@ -122,12 +123,15 @@ jobs: - '**/*go.sum' - '**/*go.mod' - '**/*Dockerfile' + - '!system-tests/**' + - '!devenv/**' + - '!core/scripts/cre/**' - 'core/**/migrations/*.sql' - 'core/**/config/**/*.toml' - 'integration-tests/**/*.toml' cre_changes: - *core_changes - - 'core/scripts/cre/environment/**/*' + - 'core/scripts/cre/**' - 'system-tests/**' - 'plugins/plugins.private.yaml' - 'plugins/plugins.public.yaml' From 029f3437b9d1b176491c175ecab9e969f8e211ed Mon Sep 17 00:00:00 2001 From: Bartek Tofel Date: Wed, 18 Mar 2026 13:13:18 +0100 Subject: [PATCH 2/3] test commit --- system-tests/tests/test-helpers/before_suite.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/system-tests/tests/test-helpers/before_suite.go b/system-tests/tests/test-helpers/before_suite.go index 7318eddf7c7..1879e25a90f 100644 --- a/system-tests/tests/test-helpers/before_suite.go +++ b/system-tests/tests/test-helpers/before_suite.go @@ -23,6 +23,8 @@ import ( ttypes "github.com/smartcontractkit/chainlink/system-tests/tests/test-helpers/configuration" ) +// TOOD test comment, remove me + func SetupTestEnvironmentWithConfig(t *testing.T, tconf *ttypes.TestConfig, flags ...string) *ttypes.TestEnvironment { t.Helper() From fed0209f04166c790f1a13f0eceabc4ca2d37380 Mon Sep 17 00:00:00 2001 From: Bartek Tofel Date: Wed, 18 Mar 2026 14:33:18 +0100 Subject: [PATCH 3/3] fix filter --- .../workflows/integration-in-memory-tests.yml | 1 + .github/workflows/integration-tests.yml | 29 +++++-------------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/.github/workflows/integration-in-memory-tests.yml b/.github/workflows/integration-in-memory-tests.yml index 3b7e33646f9..ba6c2fad23e 100644 --- a/.github/workflows/integration-in-memory-tests.yml +++ b/.github/workflows/integration-in-memory-tests.yml @@ -43,6 +43,7 @@ jobs: - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2 id: changes with: + # This is a valid input, see https://github.com/dorny/paths-filter/pull/226 predicate-quantifier: "every" filters: | changes: diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 8b9c23a8553..6369548648f 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -108,36 +108,21 @@ jobs: - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2 id: changes with: + # This is a valid input, see https://github.com/dorny/paths-filter/pull/226 predicate-quantifier: "every" filters: | general_changes: - - '.github/workflows/integration-tests.yml' - - '.github/workflows/run-e2e-tests-reusable-workflow.yml' - - '.github/workflows/cre-system-tests.yaml' - - '.github/e2e-tests.yml' - - 'GNUmakefile' - - 'core/chainlink.Dockerfile' - - 'plugins/chainlink.Dockerfile' - core_changes: &core_changes - - '**/*.go' - - '**/*go.sum' - - '**/*go.mod' - - '**/*Dockerfile' + - '{.github/workflows/integration-tests.yml,.github/workflows/run-e2e-tests-reusable-workflow.yml,.github/workflows/cre-system-tests.yaml,.github/e2e-tests.yml,GNUmakefile,core/chainlink.Dockerfile,plugins/chainlink.Dockerfile}' + core_changes: + - '{**/*.go,**/*go.sum,**/*go.mod,**/*Dockerfile,core/**/migrations/*.sql,core/**/config/**/*.toml,integration-tests/**/*.toml}' - '!system-tests/**' - '!devenv/**' - '!core/scripts/cre/**' - - 'core/**/migrations/*.sql' - - 'core/**/config/**/*.toml' - - 'integration-tests/**/*.toml' cre_changes: - - *core_changes - - 'core/scripts/cre/**' - - 'system-tests/**' - - 'plugins/plugins.private.yaml' - - 'plugins/plugins.public.yaml' + - '{**/*.go,**/*go.sum,**/*go.mod,**/*Dockerfile,core/**/migrations/*.sql,core/**/config/**/*.toml,core/scripts/cre/**,system-tests/**,plugins/plugins.private.yaml,plugins/plugins.public.yaml}' + - '!integration-tests/**' ccip_changes: - - '**/*ccip*' - - '**/*ccip*/**' + - '{**/*ccip*,**/*ccip*/**}' labels: name: Get PR labels and set runner labels