riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Krystine Sherwin 2024-03-04 12:00:51 +13:00
parent 616848b773
commit 62440246ec
No known key found for this signature in database
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/test-compile.yml vendored
View File

@ -30,6 +30,7 @@ jobs:
env: env:
CXXSTD: ${{ matrix.cpp_std }} CXXSTD: ${{ matrix.cpp_std }}
CXXFLAGS: ${{ startsWith(matrix.compiler, 'gcc') && '-Wp,-D_GLIBCXX_ASSERTIONS' || ''}} CXXFLAGS: ${{ startsWith(matrix.compiler, 'gcc') && '-Wp,-D_GLIBCXX_ASSERTIONS' || ''}}
CC_SHORT: ${{ startsWith(matrix.compiler, 'gcc') && 'gcc' || 'clang' }}
strategy: strategy:
matrix: matrix:
os: os:
@ -43,9 +44,6 @@ jobs:
- 'c++17' - 'c++17'
- 'c++20' - 'c++20'
include: include:
# Add os_name
- os: ubuntu-20.04
os_name: focal
# macOS builds # macOS builds
- os: macos-13 - os: macos-13
compiler: 'clang' compiler: 'clang'
@ -55,11 +53,9 @@ jobs:
cpp_std: 'c++17' cpp_std: 'c++17'
# Limited testing for older compilers # Limited testing for older compilers
- os: ubuntu-20.04 - os: ubuntu-20.04
os_name: focal
compiler: 'clang-11' compiler: 'clang-11'
cpp_std: 'c++11' cpp_std: 'c++11'
- os: ubuntu-20.04 - os: ubuntu-20.04
os_name: focal
compiler: 'gcc-10' compiler: 'gcc-10'
cpp_std: 'c++11' cpp_std: 'c++11'
fail-fast: false fail-fast: false
@ -109,8 +105,8 @@ jobs:
- name: Build - name: Build
shell: bash shell: bash
run: | run: |
make config-${CC%%-*} make config-$CC_SHORT
make -j$procs CXXSTD=$CXXSTD CC=$CC CXX=$CXX LD=$CC make -j$procs CXXSTD=$CXXSTD
- name: Log yosys-config output - name: Log yosys-config output
run: | run: |