Skip to content

Commit a02dee2

Browse files
committed
Allow os matrix to be overridden
1 parent 3499fb2 commit a02dee2

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

.github/workflows/llvm-project-tests.yml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ on:
1212
required: false
1313
extra_cmake_args:
1414
required: false
15+
os_list:
16+
required: false
17+
default: '["ubuntu-latest", "windows-2019", "macOS-11"]'
1518
workflow_call:
1619
inputs:
1720
build_target:
@@ -26,6 +29,15 @@ on:
2629
required: false
2730
type: string
2831

32+
os_list:
33+
required: false
34+
type: string
35+
# Use windows-2019 due to:
36+
# https://developercommunity.visualstudio.com/t/Prev-Issue---with-__assume-isnan-/1597317
37+
# We're using a specific version of macOS due to:
38+
# https://github.com/actions/virtual-environments/issues/5900
39+
default: '["ubuntu-latest", "windows-2019", "macOS-11"]'
40+
2941
concurrency:
3042
# Skip intermediate builds: always.
3143
# Cancel intermediate builds: only if it is a pull request build.
@@ -41,14 +53,7 @@ jobs:
4153
strategy:
4254
fail-fast: false
4355
matrix:
44-
os:
45-
- ubuntu-latest
46-
# Use windows-2019 due to:
47-
# https://developercommunity.visualstudio.com/t/Prev-Issue---with-__assume-isnan-/1597317
48-
- windows-2019
49-
# We're using a specific version of macOS due to:
50-
# https://github.com/actions/virtual-environments/issues/5900
51-
- macOS-11
56+
os: ${{ fromJSON(inputs.os_list) }}
5257
steps:
5358
- name: Setup Windows
5459
if: startsWith(matrix.os, 'windows')

.github/workflows/spirv-tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ jobs:
2626
build_target: check-llvm-codegen-spirv
2727
projects:
2828
extra_cmake_args: '-DLLVM_TARGETS_TO_BUILD="" -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="SPIRV"'
29+
os_list: '["ubuntu-latest"]'

0 commit comments

Comments
 (0)