Skip to content

Commit

Permalink
ci: Default clang build
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
KrystalDelusion committed Feb 6, 2024
1 parent 3b9f5f6 commit 04150a5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/test-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
os:
- { id: ubuntu-20.04, name: focal }
compiler:
- 'clang'
- 'clang-12'
- 'gcc-11'
cpp_std:
Expand All @@ -43,7 +44,7 @@ jobs:
echo "CXXFLAGS=-Wp,-D_GLIBCXX_ASSERTIONS" >> $GITHUB_ENV
- name: Setup Clang
if: startsWith(matrix.compiler, 'clang')
if: startsWith(matrix.compiler, 'clang') && (matrix.compiler != 'clang')
shell: bash
run: |
wget https://apt.llvm.org/llvm-snapshot.gpg.key
Expand Down Expand Up @@ -85,7 +86,7 @@ jobs:
tar -cvf ../build.tar share/ yosys yosys-*
- 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
with:
name: build-artifact
Expand Down
2 changes: 1 addition & 1 deletion tests/tools/autotest.mk
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SEEDOPT=-S$(SEED)
endif

$(MAKECMDGOALS):
@$(basename $(MAKEFILE_LIST)).sh -G -j $(SEEDOPT) $(EXTRA_FLAGS) $@
@$(basename $(MAKEFILE_LIST)).sh -G -j -v $(SEEDOPT) $(EXTRA_FLAGS) $@

.PHONY: $(MAKECMDGOALS)

0 comments on commit 04150a5

Please sign in to comment.