Simplify CI push vs pull_request de-dupe logickc/ci-push-or-pull-1

GitHub workflows that run on: [push, pull_request] events will
create duplicate jobs when team members push updates to a PR,
because this action creates both events.

This commit attempts to simplify our existing job de-dupe
logic.

7 files changed, 11 insertions, 10 deletions

diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
index b1aaad3bc..95ea7cb10 100644
--- a/.github/workflows/analysis.yml
+++ b/.github/workflows/analysis.yml
@@ -14,8 +14,8 @@ env:
 jobs:
   run_linters:
     name: Script linters
+    if: github.event_name != 'push' || github.ref != 'refs/heads/main'
     runs-on: ubuntu-20.04
-    if: github.event_name != 'pull_request' || contains('dreamer,kcgen,ant-222,Wengier,kklobe,shermp,johnnovak,FeralChild64', github.actor) == false
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
diff --git a/.github/workflows/dormant/windows-2019.yml b/.github/workflows/dormant/windows-2019.yml
index aec4e8f96..d26aa92c5 100644
--- a/.github/workflows/dormant/windows-2019.yml
+++ b/.github/workflows/dormant/windows-2019.yml
@@ -10,7 +10,7 @@ jobs:
   build_windows_vs:
     name: ${{ matrix.conf.name }}
     runs-on: windows-latest
-    if: github.event_name != 'pull_request' || contains('dreamer,kcgen,ant-222,Wengier', github.actor) == false
+    if: github.event_name != 'push' || github.ref != 'refs/heads/main'
     strategy:
       matrix:
         conf:
diff --git a/.github/workflows/dormant/windows-msys2.yml b/.github/workflows/dormant/windows-msys2.yml
index 738ddd99c..22775f9e9 100644
--- a/.github/workflows/dormant/windows-msys2.yml
+++ b/.github/workflows/dormant/windows-msys2.yml
@@ -6,7 +6,7 @@ jobs:
   build_windows_msys2:
     name: ${{ matrix.conf.compiler }} ${{ matrix.conf.bits }}-bit
     runs-on: windows-latest
-    if: github.event_name != 'pull_request' || contains('dreamer,kcgen,ant-222', github.actor) == false
+    if: github.event_name != 'push' || github.ref != 'refs/heads/main'
     strategy:
       # Because Clang depends on GCC, we run the Clang-32/64bit jobs
       # first to create combined caches that include both Clang and GCC.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 4d8aa0a10..b5c323712 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -16,7 +16,7 @@ jobs:
   build_ubuntu:
     name: ${{ matrix.conf.name }}
     runs-on: ${{ matrix.conf.os }}
-    if: github.event_name != 'pull_request' || contains('dreamer,kcgen,ant-222,Wengier,kklobe,shermp,johnnovak,FeralChild64', github.actor) == false
+    if: github.event_name != 'push' || github.ref != 'refs/heads/main'
     strategy:
       matrix:
         conf:
@@ -150,7 +150,7 @@ jobs:
   build_linux_release:
     name: Release build
     runs-on: ubuntu-18.04
-    if: github.event_name != 'pull_request' || contains('dreamer,kcgen,ant-222,Wengier,kklobe,shermp,johnnovak,FeralChild64', github.actor) == false
+    if: github.event_name != 'push' || github.ref != 'refs/heads/main'
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 216c9dd42..647d283e1 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -10,7 +10,7 @@ jobs:
   build_macos:
     name: ${{ matrix.conf.name }} (${{ matrix.conf.arch }})
     runs-on: ${{ matrix.conf.host }}
-    if: github.event_name != 'pull_request' || contains('dreamer,kcgen,ant-222,Wengier,kklobe,shermp,johnnovak,FeralChild64', github.actor) == false
+    if: github.event_name != 'push' || github.ref != 'refs/heads/main'
     strategy:
       fail-fast: false
       matrix:
@@ -143,7 +143,7 @@ jobs:
   build_macos_release:
     name: Release build (${{ matrix.runner.arch }})
     runs-on: ${{ matrix.runner.host }}
-    if: github.event_name != 'pull_request' || contains('dreamer,kcgen,ant-222,Wengier,kklobe,shermp,johnnovak,FeralChild64', github.actor) == false
+    if: github.event_name != 'push' || github.ref != 'refs/heads/main'
     env:
       MIN_SUPPORTED_MACOSX_DEPLOYMENT_TARGET: ${{ matrix.runner.minimum_deployment }}
 
diff --git a/.github/workflows/windows-meson-msys2.yml b/.github/workflows/windows-meson-msys2.yml
index c284e424c..ad7718875 100644
--- a/.github/workflows/windows-meson-msys2.yml
+++ b/.github/workflows/windows-meson-msys2.yml
@@ -18,7 +18,7 @@ jobs:
   build_msys2:
     name: ${{ matrix.conf.name }}
     runs-on: windows-latest
-    if: github.event_name != 'pull_request' || contains('dreamer,kcgen,ant-222,Wengier,kklobe,shermp,johnnovak,FeralChild64', github.actor) == false
+    if: github.event_name != 'push' || github.ref != 'refs/heads/main'
 
     strategy:
       matrix:
@@ -149,7 +149,7 @@ jobs:
   build_msys2_release:
     name: ${{ matrix.conf.name }} Release
     runs-on: windows-latest
-    if: github.event_name != 'pull_request' || contains('dreamer,kcgen,ant-222,Wengier,kklobe,shermp,johnnovak,FeralChild64', github.actor) == false
+    if: github.event_name != 'push' || github.ref != 'refs/heads/main'
 
     strategy:
       matrix:
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 9019b041a..0c4fef533 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -15,7 +15,7 @@ jobs:
   build_windows_vs:
     name: ${{ matrix.conf.name }}
     runs-on: windows-2022
-    if: github.event_name != 'pull_request' || contains('dreamer,kcgen,ant-222,Wengier,kklobe,shermp,johnnovak,FeralChild64', github.actor) == false
+    if: github.event_name != 'push' || github.ref != 'refs/heads/main'
     strategy:
       matrix:
         conf:
@@ -84,6 +84,7 @@ jobs:
 
   build_windows_vs_release:
     name: ${{ matrix.conf.name }}
+    if: github.event_name != 'push' || github.ref != 'refs/heads/main'
     runs-on: windows-2022
     strategy:
       matrix: