Skip to content

Commit

Permalink
ci: Add CC_SHORT env var
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
KrystalDelusion committed Mar 3, 2024
1 parent 52e3fee commit 6006bf6
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions .github/workflows/test-compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ jobs:
env:
CXXSTD: ${{ matrix.cpp_std }}
CXXFLAGS: ${{ startsWith(matrix.compiler, 'gcc') && '-Wp,-D_GLIBCXX_ASSERTIONS' || ''}}
CC_SHORT: ${{ startsWith(matrix.compiler, 'gcc') && 'gcc' || 'clang' }}
strategy:
matrix:
os:
Expand All @@ -27,9 +28,6 @@ jobs:
- 'c++17'
- 'c++20'
include:
# Add os_name
- os: ubuntu-20.04
os_name: focal
# macOS builds
- os: macos-13
compiler: 'clang'
Expand All @@ -39,11 +37,9 @@ jobs:
cpp_std: 'c++17'
# Limited testing for older compilers
- os: ubuntu-20.04
os_name: focal
compiler: 'clang-11'
cpp_std: 'c++11'
- os: ubuntu-20.04
os_name: focal
compiler: 'gcc-10'
cpp_std: 'c++11'
fail-fast: false
Expand Down Expand Up @@ -93,8 +89,8 @@ jobs:
- name: Build
shell: bash
run: |
make config-${CC%%-*}
make -j$procs CXXSTD=$CXXSTD CC=$CC CXX=$CXX LD=$CC
make config-$(CC_SHORT)
make -j$procs CXXSTD=$CXXSTD
- name: Log yosys-config output
run: |
Expand Down

0 comments on commit 6006bf6

Please sign in to comment.