From 97bf2936c97be22f4c301c34c3bc5f4e0b2ce566 Mon Sep 17 00:00:00 2001 From: Luca Bertagna Date: Mon, 4 Nov 2024 12:42:35 -0700 Subject: [PATCH] Workflows: fix logic for eamxx jobs skipping --- .github/workflows/eamxx-standalone-testing.yml | 12 ++++++------ .github/workflows/eamxx-v1-testing.yml | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/eamxx-standalone-testing.yml b/.github/workflows/eamxx-standalone-testing.yml index 33b08a7d16b..4b122e3641d 100644 --- 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.job_to_run == 'gcc-openmp' || + github.event.inputs.job_to_run == '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.job_to_run == 'gcc-cuda' || + github.event.inputs.job_to_run == '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 index 5f13a6510ab..47129159f82 100644 --- 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