From f4927bd9f3ecdaf0cd69cbee5805ebbb3a2ebf34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Wed, 6 Sep 2023 16:18:18 +0200 Subject: [PATCH] Revert "avoid duplicated workflow invocations for pushes in PRs made from root repository branches (#5377)" This reverts commit bf5e63300eb5d271ab774ec91eff9a50678458f5. --- .github/workflows/CI-cygwin.yml | 9 +-------- .github/workflows/CI-mingw.yml | 9 +-------- .github/workflows/CI-unixish-docker.yml | 9 +-------- .github/workflows/CI-unixish.yml | 9 +-------- .github/workflows/CI-windows.yml | 9 +-------- .github/workflows/asan.yml | 9 +-------- .github/workflows/buildman.yml | 9 +-------- .github/workflows/clang-tidy.yml | 9 +-------- .github/workflows/codeql-analysis.yml | 9 +-------- .github/workflows/coverage.yml | 9 +-------- .github/workflows/format.yml | 9 +-------- .github/workflows/scriptcheck.yml | 9 +-------- .github/workflows/selfcheck.yml | 9 +-------- .github/workflows/tsan.yml | 9 +-------- .github/workflows/ubsan.yml | 9 +-------- .github/workflows/valgrind.yml | 9 +-------- 16 files changed, 16 insertions(+), 128 deletions(-) diff --git a/.github/workflows/CI-cygwin.yml b/.github/workflows/CI-cygwin.yml index b9ea30470da..31557ecbcc7 100644 --- a/.github/workflows/CI-cygwin.yml +++ b/.github/workflows/CI-cygwin.yml @@ -4,14 +4,7 @@ name: CI-cygwin -on: - push: - branches: - - 'main' - - 'releases/**' - tags: - - '2.*' - pull_request: +on: [push,pull_request] permissions: contents: read diff --git a/.github/workflows/CI-mingw.yml b/.github/workflows/CI-mingw.yml index b5c067dc7a4..a865ec737a9 100644 --- a/.github/workflows/CI-mingw.yml +++ b/.github/workflows/CI-mingw.yml @@ -4,14 +4,7 @@ name: CI-mingw -on: - push: - branches: - - 'main' - - 'releases/**' - tags: - - '2.*' - pull_request: +on: [push,pull_request] permissions: contents: read diff --git a/.github/workflows/CI-unixish-docker.yml b/.github/workflows/CI-unixish-docker.yml index 9bfc5a017b5..3558e6a5721 100644 --- a/.github/workflows/CI-unixish-docker.yml +++ b/.github/workflows/CI-unixish-docker.yml @@ -2,14 +2,7 @@ # Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners name: CI-unixish-docker -on: - push: - branches: - - 'main' - - 'releases/**' - tags: - - '2.*' - pull_request: +on: [push, pull_request] permissions: contents: read diff --git a/.github/workflows/CI-unixish.yml b/.github/workflows/CI-unixish.yml index 44535cd077d..856229f6dfe 100644 --- a/.github/workflows/CI-unixish.yml +++ b/.github/workflows/CI-unixish.yml @@ -2,14 +2,7 @@ # Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners name: CI-unixish -on: - push: - branches: - - 'main' - - 'releases/**' - tags: - - '2.*' - pull_request: +on: [push, pull_request] permissions: contents: read diff --git a/.github/workflows/CI-windows.yml b/.github/workflows/CI-windows.yml index d0bc46e299f..ece70a14b39 100644 --- a/.github/workflows/CI-windows.yml +++ b/.github/workflows/CI-windows.yml @@ -4,14 +4,7 @@ name: CI-windows -on: - push: - branches: - - 'main' - - 'releases/**' - tags: - - '2.*' - pull_request: +on: [push,pull_request] permissions: contents: read diff --git a/.github/workflows/asan.yml b/.github/workflows/asan.yml index 89dc81d7cfe..c29ecde8a4a 100644 --- a/.github/workflows/asan.yml +++ b/.github/workflows/asan.yml @@ -2,14 +2,7 @@ # Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners name: address sanitizer -on: - push: - branches: - - 'main' - - 'releases/**' - tags: - - '2.*' - pull_request: +on: [push, pull_request] permissions: contents: read diff --git a/.github/workflows/buildman.yml b/.github/workflows/buildman.yml index 30cc5b16ad5..4bbdf779661 100644 --- a/.github/workflows/buildman.yml +++ b/.github/workflows/buildman.yml @@ -1,13 +1,6 @@ name: Build manual -on: - push: - branches: - - 'main' - - 'releases/**' - tags: - - '2.*' - pull_request: +on: [push, pull_request] permissions: contents: read diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml index 3eda1954994..7bcd8bd8e31 100644 --- a/.github/workflows/clang-tidy.yml +++ b/.github/workflows/clang-tidy.yml @@ -2,14 +2,7 @@ # Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners name: clang-tidy -on: - push: - branches: - - 'main' - - 'releases/**' - tags: - - '2.*' - pull_request: +on: [push, pull_request] permissions: contents: read diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f486cf9e24f..12d15855527 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -1,13 +1,6 @@ name: "CodeQL" -on: - push: - branches: - - 'main' - - 'releases/**' - tags: - - '2.*' - pull_request: +on: [push, pull_request] permissions: contents: read diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 5018f2c3b8a..b07c15811cd 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -2,14 +2,7 @@ # Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners name: Coverage -on: - push: - branches: - - 'main' - - 'releases/**' - tags: - - '2.*' - pull_request: +on: [push, pull_request] permissions: contents: read diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 3ae9ceb200f..ff3134b7ed5 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -2,14 +2,7 @@ # Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners name: format -on: - push: - branches: - - 'main' - - 'releases/**' - tags: - - '2.*' - pull_request: +on: [push, pull_request] permissions: contents: read diff --git a/.github/workflows/scriptcheck.yml b/.github/workflows/scriptcheck.yml index ce7b313a053..eea2e925da6 100644 --- a/.github/workflows/scriptcheck.yml +++ b/.github/workflows/scriptcheck.yml @@ -2,14 +2,7 @@ # Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners name: scriptcheck -on: - push: - branches: - - 'main' - - 'releases/**' - tags: - - '2.*' - pull_request: +on: [push, pull_request] permissions: contents: read diff --git a/.github/workflows/selfcheck.yml b/.github/workflows/selfcheck.yml index 70cc147c40f..8cd028f9af9 100644 --- a/.github/workflows/selfcheck.yml +++ b/.github/workflows/selfcheck.yml @@ -2,14 +2,7 @@ # Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners name: selfcheck -on: - push: - branches: - - 'main' - - 'releases/**' - tags: - - '2.*' - pull_request: +on: [push, pull_request] permissions: contents: read diff --git a/.github/workflows/tsan.yml b/.github/workflows/tsan.yml index 850453aa105..876e1976141 100644 --- a/.github/workflows/tsan.yml +++ b/.github/workflows/tsan.yml @@ -2,14 +2,7 @@ # Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners name: thread sanitizer -on: - push: - branches: - - 'main' - - 'releases/**' - tags: - - '2.*' - pull_request: +on: [push, pull_request] permissions: contents: read diff --git a/.github/workflows/ubsan.yml b/.github/workflows/ubsan.yml index 2fc169dcc23..2a422710b74 100644 --- a/.github/workflows/ubsan.yml +++ b/.github/workflows/ubsan.yml @@ -2,14 +2,7 @@ # Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners name: undefined behaviour sanitizers -on: - push: - branches: - - 'main' - - 'releases/**' - tags: - - '2.*' - pull_request: +on: [push, pull_request] permissions: contents: read diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml index cf03ff89fa3..1753e6f0acd 100644 --- a/.github/workflows/valgrind.yml +++ b/.github/workflows/valgrind.yml @@ -2,14 +2,7 @@ # Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners name: valgrind -on: - push: - branches: - - 'main' - - 'releases/**' - tags: - - '2.*' - pull_request: +on: [push, pull_request] permissions: contents: read