Skip to content

Commit 33d401d

Browse files
authored
Update CI workflow OS selection conditions
Refactor CI workflow to simplify OS selection logic.
1 parent ec969e5 commit 33d401d

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

.github/workflows/ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@ on:
1919
default: false
2020
type: boolean
2121

22-
env:
23-
RUN_MACOS: ${{ !(github.event_name == 'pull_request' ||
24-
(github.event_name == 'push' && !startsWith(github.ref, 'refs/tags/v')) ||
25-
(github.event_name == 'workflow_dispatch' && inputs.full_build != 'true')) }}
26-
22+
2723
jobs:
2824
build-and-test:
2925
name: Run on ${{ matrix.os }} with SOFA ${{ matrix.sofa_branch }} / MeshRefinement=${{ matrix.with_mesh_refinement }}
@@ -47,9 +43,13 @@ jobs:
4743
fail-fast: false
4844

4945
matrix:
50-
os: ${{ fromJSON(env.RUN_MACOS == 'true'
51-
&& '["ubuntu-22.04","windows-2022","macos-14"]'
52-
|| '["ubuntu-22.04","windows-2022"]') }}
46+
os: ${{ fromJSON(
47+
(github.event_name == 'pull_request' ||
48+
(github.event_name == 'push' && !startsWith(github.ref, 'refs/tags/v')) ||
49+
(github.event_name == 'workflow_dispatch' && inputs.full_build != 'true'))
50+
&& '["ubuntu-22.04","windows-2022"]'
51+
|| '["ubuntu-22.04","windows-2022","macos-14"]'
52+
) }}
5353

5454
sofa_branch: [master]
5555
with_mesh_refinement: [ON, OFF]

0 commit comments

Comments
 (0)