Workflows: fix logic for eamxx jobs skipping

E3SM-Project · Nov 4, 2024 · 26310ce · 26310ce
1 parent aef01e8
commit 26310ce
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/eamxx-standalone-testing.yml b/.github/workflows/eamxx-standalone-testing.yml
@@ -51,9 +51,9 @@ jobs:
       fail-fast: false
       matrix:
         build_type: [sp, dbg, fpe, opt]
-    if: ${{ !(github.event_name == 'workflow_dispatch' &&
-              github.event.inputs.jobs_list != 'gcc-openmp' &&
-              github.event.inputs.jobs_list != 'all') }}
+    if: ${{ github.event_name != 'workflow_dispatch' ||
+            github.event.inputs.jobs_list == 'gcc-openmp' ||
+            github.event.inputs.jobs_list == 'all' }}
     name: gcc-openmp / ${{ matrix.build_type }}
     steps:
       - name: Check out the repository
@@ -96,9 +96,9 @@ jobs:
       fail-fast: false
       matrix:
         build_type: [sp, dbg, opt]
-    if: ${{ !(github.event_name == 'workflow_dispatch' &&
-              github.event.inputs.jobs_list != 'gcc-cuda' &&
-              github.event.inputs.jobs_list != 'all') }}
+    if: ${{ github.event_name != 'workflow_dispatch' ||
+            github.event.inputs.jobs_list == 'gcc-cuda' ||
+            github.event.inputs.jobs_list == 'all' }}
     name: gcc-cuda / ${{ matrix.build_type }}
     steps:
       - name: Check out the repository

diff --git a/.github/workflows/eamxx-v1-testing.yml b/.github/workflows/eamxx-v1-testing.yml
@@ -55,9 +55,9 @@ jobs:
             short_name: SMS_D_Ln5.ne4pg2_oQU480.F2010-SCREAMv1-MPASSI.scream-mam4xx-all_mam4xx_procs
       fail-fast: false
     name: cpu-gcc / ${{ matrix.test.short_name }}
-    if: ${{ !(github.event_name == 'workflow_dispatch' &&
-              github.event.inputs.jobs_list != 'cpu-gcc' &&
-              github.event.inputs.jobs_list != 'all') }}
+    if: ${{ github.event_name != 'workflow_dispatch' ||
+            github.event.inputs.job_to_run == 'cpu-gcc' ||
+            github.event.inputs.job_to_run == 'all' }}
     steps:
       - name: Check out the repository
         uses: actions/checkout@v4