Skip to content

Commit 6006bf6

Browse files
ci: Add CC_SHORT env var
New Setup Cpp step uses fully qualified paths for $CC and $CXX so ${CC%%-*} no longer works. Remove os_name since it's not needed anymore.
1 parent 52e3fee commit 6006bf6

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

.github/workflows/test-compile.yml

+3-7
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
env:
1515
CXXSTD: ${{ matrix.cpp_std }}
1616
CXXFLAGS: ${{ startsWith(matrix.compiler, 'gcc') && '-Wp,-D_GLIBCXX_ASSERTIONS' || ''}}
17+
CC_SHORT: ${{ startsWith(matrix.compiler, 'gcc') && 'gcc' || 'clang' }}
1718
strategy:
1819
matrix:
1920
os:
@@ -27,9 +28,6 @@ jobs:
2728
- 'c++17'
2829
- 'c++20'
2930
include:
30-
# Add os_name
31-
- os: ubuntu-20.04
32-
os_name: focal
3331
# macOS builds
3432
- os: macos-13
3533
compiler: 'clang'
@@ -39,11 +37,9 @@ jobs:
3937
cpp_std: 'c++17'
4038
# Limited testing for older compilers
4139
- os: ubuntu-20.04
42-
os_name: focal
4340
compiler: 'clang-11'
4441
cpp_std: 'c++11'
4542
- os: ubuntu-20.04
46-
os_name: focal
4743
compiler: 'gcc-10'
4844
cpp_std: 'c++11'
4945
fail-fast: false
@@ -93,8 +89,8 @@ jobs:
9389
- name: Build
9490
shell: bash
9591
run: |
96-
make config-${CC%%-*}
97-
make -j$procs CXXSTD=$CXXSTD CC=$CC CXX=$CXX LD=$CC
92+
make config-$(CC_SHORT)
93+
make -j$procs CXXSTD=$CXXSTD
9894
9995
- name: Log yosys-config output
10096
run: |

0 commit comments

Comments
 (0)