Skip to content

Commit c860bb5

Browse files
mfepmfep
authored
Update CI matrix (#252)
* fix(ci): Fixed gcc paths in macos jobs * fix(ci): Removed VC++ v141 from Windows matrix * fix(ci): Setting CXX on Linux/macos * fix(ci): Using actions/checkout@v4
1 parent 1e958b2 commit c860bb5

1 file changed

Lines changed: 60 additions & 29 deletions

File tree

‎.github/workflows/presubmit.yml‎

Lines changed: 60 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
run:
1717
shell: bash
1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020
with:
2121
# repository: ${{github.repository}} (default)
2222
fetch-depth: 0
@@ -36,11 +36,19 @@ jobs:
3636
strategy:
3737
matrix:
3838
CMAKE: [3.26.4]
39-
C_COMPILER:
40-
- gcc-11
41-
- gcc-13
42-
- clang-14
43-
- clang-16
39+
COMPILER:
40+
- C_NAME: gcc
41+
CXX_NAME: g++
42+
VER: 11
43+
- C_NAME: gcc
44+
CXX_NAME: g++
45+
VER: 13
46+
- C_NAME: clang
47+
CXX_NAME: clang++
48+
VER: 14
49+
- C_NAME: clang
50+
CXX_NAME: clang++
51+
VER: 16
4452
BIN: [64]
4553
STD: [99, 11, 17]
4654
CONF:
@@ -54,47 +62,65 @@ jobs:
5462
- streamhpc/opencl-sdk-intelcpu:ubuntu-22.04-20230717
5563
include:
5664
- CMAKE: system
57-
C_COMPILER: gcc-9
65+
COMPILER:
66+
C_NAME: gcc
67+
CXX_NAME: g++
68+
VER: 9
5869
BIN: 64
5970
STD: 99
6071
CONF:
6172
GEN: Unix Makefiles
6273
CONFIG: Debug
6374
IMAGE: streamhpc/opencl-sdk-intelcpu:ubuntu-20.04-20230717
6475
- CMAKE: system
65-
C_COMPILER: gcc-9
76+
COMPILER:
77+
C_NAME: gcc
78+
CXX_NAME: g++
79+
VER: 9
6680
BIN: 64
6781
STD: 99
6882
CONF:
6983
GEN: Unix Makefiles
7084
CONFIG: Release
7185
IMAGE: streamhpc/opencl-sdk-intelcpu:ubuntu-20.04-20230717
7286
- CMAKE: system
73-
C_COMPILER: gcc-9
87+
COMPILER:
88+
C_NAME: gcc
89+
CXX_NAME: g++
90+
VER: 9
7491
BIN: 32
7592
STD: 99
7693
CONF:
7794
GEN: Unix Makefiles
7895
CONFIG: Debug
7996
IMAGE: streamhpc/opencl-sdk-intelcpu:ubuntu-20.04-20230717
8097
- CMAKE: system
81-
C_COMPILER: gcc-9
98+
COMPILER:
99+
C_NAME: gcc
100+
CXX_NAME: g++
101+
VER: 9
82102
BIN: 32
83103
STD: 99
84104
CONF:
85105
GEN: Unix Makefiles
86106
CONFIG: Release
87107
IMAGE: streamhpc/opencl-sdk-intelcpu:ubuntu-20.04-20230717
88108
- CMAKE: system
89-
C_COMPILER: gcc-11
109+
COMPILER:
110+
C_NAME: gcc
111+
CXX_NAME: g++
112+
VER: 11
90113
BIN: 64
91114
STD: 99
92115
CONF:
93116
GEN: Unix Makefiles
94117
CONFIG: Debug
95118
IMAGE: streamhpc/opencl-sdk-intelcpu:ubuntu-22.04-20230717
96119
- CMAKE: system
97-
C_COMPILER: gcc-11
120+
COMPILER:
121+
C_NAME: gcc
122+
CXX_NAME: g++
123+
VER: 11
98124
BIN: 64
99125
STD: 99
100126
CONF:
@@ -106,7 +132,8 @@ jobs:
106132
CMAKE_EXE: /opt/Kitware/CMake/${{matrix.CMAKE}}/bin/cmake
107133
CPACK_EXE: /opt/Kitware/CMake/${{matrix.CMAKE}}/bin/cpack
108134
CTEST_EXE: /opt/Kitware/CMake/${{matrix.CMAKE}}/bin/ctest
109-
CC: ${{matrix.C_COMPILER}}
135+
CC: ${{matrix.COMPILER.C_NAME}}-${{matrix.COMPILER.VER}}
136+
CXX: ${{matrix.COMPILER.CXX_NAME}}-${{matrix.COMPILER.VER}}
110137
CFLAGS: -Wall -Wextra -pedantic -Werror -m${{matrix.BIN}}
111138

112139
steps:
@@ -118,7 +145,7 @@ jobs:
118145
echo "CTEST_EXE=ctest" >> "$GITHUB_ENV"
119146

120147
- name: Checkout OpenCL-Headers
121-
uses: actions/checkout@v3
148+
uses: actions/checkout@v4
122149

123150
- name: Configure
124151
run: $CMAKE_EXE
@@ -243,7 +270,7 @@ jobs:
243270
shell: pwsh
244271
strategy:
245272
matrix:
246-
VER: [v141, v142, v143, clangcl]
273+
VER: [v142, v143, clangcl]
247274
GEN: [Visual Studio 17 2022, Ninja Multi-Config]
248275
BIN: [x64]
249276
STD: [99, 11, 17]
@@ -282,7 +309,7 @@ jobs:
282309
Remove-Item ~\Downloads\*
283310
284311
- name: Checkout OpenCL-Headers
285-
uses: actions/checkout@v3
312+
uses: actions/checkout@v4
286313

287314
- name: Configure (MSBuild)
288315
if: matrix.GEN == 'Visual Studio 17 2022'
@@ -304,7 +331,6 @@ jobs:
304331
if: matrix.GEN == 'Ninja Multi-Config'
305332
run: |
306333
$VER = switch ('${{matrix.VER}}') { `
307-
'v141' {'14.1'} `
308334
'v142' {'14.2'} `
309335
'v143' {'14.3'} }
310336
Import-Module "${env:VS_ROOT}\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
@@ -339,7 +365,6 @@ jobs:
339365
if: matrix.GEN == 'Ninja Multi-Config'
340366
run: |
341367
$VER = switch ('${{matrix.VER}}') { `
342-
'v141' {'14.1'} `
343368
'v142' {'14.2'} `
344369
'v143' {'14.3'} }
345370
Import-Module "${env:VS_ROOT}\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
@@ -406,7 +431,6 @@ jobs:
406431
if: matrix.GEN == 'Ninja Multi-Config'
407432
run: |
408433
$VER = switch ('${{matrix.VER}}') { `
409-
'v141' {'14.1'} `
410434
'v142' {'14.2'} `
411435
'v143' {'14.3'} }
412436
Import-Module "${env:VS_ROOT}\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
@@ -471,7 +495,6 @@ jobs:
471495
if: matrix.GEN == 'Ninja Multi-Config'
472496
run: |
473497
$VER = switch ('${{matrix.VER}}') { `
474-
'v141' {'14.1'} `
475498
'v142' {'14.2'} `
476499
'v143' {'14.3'} }
477500
Import-Module "${env:VS_ROOT}\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
@@ -505,26 +528,34 @@ jobs:
505528
shell: bash
506529
strategy:
507530
matrix:
508-
C_COMPILER:
509-
- /usr/bin/clang
510-
- /usr/local/bin/gcc-11
511-
- /usr/local/bin/gcc-13
531+
COMPILER:
532+
- CC: /usr/bin/clang
533+
CXX: /usr/bin/clang++
534+
- CC: gcc-11
535+
CXX: g++-11
536+
- CC: gcc-13
537+
CXX: g++-13
512538
GEN:
513539
- Xcode
514540
- Ninja Multi-Config
515541
STD: [99, 11, 17]
516542
exclude:
517543
# These entries are excluded, since XCode selects its own compiler
518-
- C_COMPILER: /usr/local/bin/gcc-11
544+
- COMPILER:
545+
CC: gcc-11
546+
CXX: g++-11
519547
GEN: Xcode
520-
- C_COMPILER: /usr/local/bin/gcc-13
548+
- COMPILER:
549+
CC: gcc-13
550+
CXX: g++-13
521551
GEN: Xcode
522552
env:
523553
CFLAGS: -Wall -Wextra -pedantic -Werror
524-
CC: ${{matrix.C_COMPILER}}
554+
CC: ${{matrix.COMPILER.CC}}
555+
CXX: ${{matrix.COMPILER.CXX}}
525556
steps:
526557
- name: Checkout OpenCL-Headers
527-
uses: actions/checkout@v3
558+
uses: actions/checkout@v4
528559

529560
- name: Create Build Environment
530561
run: |
@@ -601,7 +632,7 @@ jobs:
601632
CFLAGS: -Wall -Wextra -pedantic -Werror
602633
steps:
603634
- name: Checkout OpenCL-Headers
604-
uses: actions/checkout@v3
635+
uses: actions/checkout@v4
605636

606637
- name: Configure
607638
run: cmake

0 commit comments

Comments
 (0)