From 9dc699a59be74e963cf7763092c05ee6acecf2b7 Mon Sep 17 00:00:00 2001 From: Sven Klemm Date: Tue, 19 Sep 2023 23:19:31 +0200 Subject: [PATCH] Fix ignored workflow logic The paths filter in github workflows will trigger when at least one of the pathes match unless everything else has been explicitly excluded. For the ignored workflows we want it to only trigger when only those files explicitly specified are changed and nothing else. --- .github/workflows/linux-32bit-build-and-test-ignored.yaml | 4 +++- .github/workflows/linux-build-and-test-ignored.yaml | 4 +++- .github/workflows/linux-build-and-test.yaml | 2 +- .github/workflows/shellcheck-ignored.yaml | 8 ++++---- .github/workflows/windows-build-and-test-ignored.yaml | 4 +++- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/linux-32bit-build-and-test-ignored.yaml b/.github/workflows/linux-32bit-build-and-test-ignored.yaml index 264917ff9..d353ae25e 100644 --- a/.github/workflows/linux-32bit-build-and-test-ignored.yaml +++ b/.github/workflows/linux-32bit-build-and-test-ignored.yaml @@ -5,13 +5,15 @@ name: Regression Linux i386 "on": push: branches: - - prerelease_test + - main paths: + - '!**' - '**.md' - 'LICENSE*' - NOTICE pull_request: paths: + - '!**' - '**.md' - 'LICENSE*' - NOTICE diff --git a/.github/workflows/linux-build-and-test-ignored.yaml b/.github/workflows/linux-build-and-test-ignored.yaml index 68a960435..9d47565e2 100644 --- a/.github/workflows/linux-build-and-test-ignored.yaml +++ b/.github/workflows/linux-build-and-test-ignored.yaml @@ -5,13 +5,15 @@ name: Regression "on": push: branches: - - prerelease_test + - main paths: + - '!**' - '**.md' - 'LICENSE*' - NOTICE pull_request: paths: + - '!**' - '**.md' - 'LICENSE*' - NOTICE diff --git a/.github/workflows/linux-build-and-test.yaml b/.github/workflows/linux-build-and-test.yaml index 1f5d5f768..967648db0 100644 --- a/.github/workflows/linux-build-and-test.yaml +++ b/.github/workflows/linux-build-and-test.yaml @@ -39,7 +39,7 @@ jobs: else .github/gh_matrix_builder.py ${{ github.event_name }} fi - + regress: # Change the JOB_NAME variable below when changing the name. name: PG${{ matrix.pg }}${{ matrix.snapshot }} ${{ matrix.name }} ${{ matrix.os }} diff --git a/.github/workflows/shellcheck-ignored.yaml b/.github/workflows/shellcheck-ignored.yaml index 694ae3c35..ce214f5bb 100644 --- a/.github/workflows/shellcheck-ignored.yaml +++ b/.github/workflows/shellcheck-ignored.yaml @@ -3,13 +3,13 @@ # executed because some files were ignored. name: Shellcheck "on": - pull_request: + push: + branches: + - main paths-ignore: - '**.sh' - .github/workflows/shellcheck.yaml - push: - branches: - - prerelease_test + pull_request: paths-ignore: - '**.sh' - .github/workflows/shellcheck.yaml diff --git a/.github/workflows/windows-build-and-test-ignored.yaml b/.github/workflows/windows-build-and-test-ignored.yaml index 7dbe17f0a..bccf66392 100644 --- a/.github/workflows/windows-build-and-test-ignored.yaml +++ b/.github/workflows/windows-build-and-test-ignored.yaml @@ -5,8 +5,9 @@ name: Regression Windows "on": push: branches: - - prerelease_test + - main paths: + - '!**' - '**.md' - CHANGELOG - 'LICENSE*' @@ -14,6 +15,7 @@ name: Regression Windows - 'bootstrap*' pull_request: paths: + - '!**' - '**.md' - CHANGELOG - 'LICENSE*'