mirror of https://github.com/YosysHQ/yosys.git
ci: Default clang build
Switch build artifact to a default clang build. Testing with the build artifact locally, `make test` is failing with `/lib/x86_64-linux-gnu/libstdc++.so.6: version 'GLIBCXX_3.4.29' not found`. Using the gcc-11 build (might be?) installing GLIBCXX_3.4.29 but not linking it into the build. Rather than trying to get it to link, just use the pre-installed `clang` instead.
This commit is contained in:
parent
93bee0fc3b
commit
5ceafea0ec
|
@ -29,12 +29,14 @@ jobs:
|
||||||
runs-on: ${{ matrix.os.id }}
|
runs-on: ${{ matrix.os.id }}
|
||||||
env:
|
env:
|
||||||
CC: ${{ matrix.compiler }}
|
CC: ${{ matrix.compiler }}
|
||||||
|
CXX: ${{ matrix.compiler }}
|
||||||
CXXSTD: ${{ matrix.cpp_std }}
|
CXXSTD: ${{ matrix.cpp_std }}
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
os:
|
os:
|
||||||
- { id: ubuntu-20.04, name: focal }
|
- { id: ubuntu-20.04, name: focal }
|
||||||
compiler:
|
compiler:
|
||||||
|
- 'clang'
|
||||||
- 'clang-12'
|
- 'clang-12'
|
||||||
- 'gcc-11'
|
- 'gcc-11'
|
||||||
cpp_std:
|
cpp_std:
|
||||||
|
@ -70,7 +72,7 @@ jobs:
|
||||||
echo "CXXFLAGS=-Wp,-D_GLIBCXX_ASSERTIONS" >> $GITHUB_ENV
|
echo "CXXFLAGS=-Wp,-D_GLIBCXX_ASSERTIONS" >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Setup Clang
|
- name: Setup Clang
|
||||||
if: startsWith(matrix.compiler, 'clang')
|
if: startsWith(matrix.compiler, 'clang') && (matrix.compiler != 'clang')
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
wget https://apt.llvm.org/llvm-snapshot.gpg.key
|
wget https://apt.llvm.org/llvm-snapshot.gpg.key
|
||||||
|
@ -105,7 +107,7 @@ jobs:
|
||||||
mkdir build
|
mkdir build
|
||||||
cd build
|
cd build
|
||||||
make -f ../Makefile config-${CC%%-*}
|
make -f ../Makefile config-${CC%%-*}
|
||||||
make -f ../Makefile -j$procs CXXSTD=$CXXSTD CC=$CC CXX=$CC LD=$CC
|
make -f ../Makefile -j$procs CXXSTD=$CXXSTD CC=$CC CXX=$CXX LD=$CC
|
||||||
|
|
||||||
- name: Log yosys-config output
|
- name: Log yosys-config output
|
||||||
run: |
|
run: |
|
||||||
|
@ -118,7 +120,7 @@ jobs:
|
||||||
tar -cvf ../build.tar share/ yosys yosys-*
|
tar -cvf ../build.tar share/ yosys yosys-*
|
||||||
|
|
||||||
- name: Store build artifact
|
- name: Store build artifact
|
||||||
if: (matrix.cpp_std == 'c++11') && (matrix.compiler == 'gcc-11')
|
if: (matrix.cpp_std == 'c++11') && (matrix.compiler == 'clang')
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: build-artifact
|
name: build-artifact
|
||||||
|
|
Loading…
Reference in New Issue