Switch clang CI build to use Ubuntu 20.04
Running it in 18.04 container would require installing libc++-dev and other packages, it's simpler to just write it on the GitHub-provided runner where they're already installed. Note that we need to explicitly choose to use clang-10, as the GitHub runner has clang-11 and clang-12 installed as well and the default clang version is 11, but only libc++-10-dev is installed, so using the default clang with -stdlib=libc++ fails out of the box.
This commit is contained in:
parent
549be66c7d
commit
ab1c5105a0
1 changed files with 7 additions and 7 deletions
14
.github/workflows/ci.yml
vendored
14
.github/workflows/ci.yml
vendored
|
|
@ -78,9 +78,9 @@ jobs:
|
|||
container: ubuntu:18.04
|
||||
configure_flags: --enable-stl --disable-compat30
|
||||
use_xvfb: true
|
||||
- name: Ubuntu 18.04 wxGTK 3 with clang
|
||||
runner: ubuntu-latest
|
||||
compiler: clang
|
||||
- name: Ubuntu 20.04 wxGTK 3 with clang
|
||||
runner: ubuntu-20.04
|
||||
compiler: clang++-10
|
||||
configure_flags: --disable-sys-libs
|
||||
use_xvfb: true
|
||||
- name: Ubuntu 20.04 wxGTK ANSI
|
||||
|
|
@ -188,10 +188,10 @@ jobs:
|
|||
|
||||
compiler=${{ matrix.compiler }}
|
||||
case "$compiler" in
|
||||
clang)
|
||||
echo CC=clang >> $GITHUB_ENV
|
||||
echo CXX='clang++ -stdlib=libc++' >> $GITHUB_ENV
|
||||
echo LD=clang++ >> $GITHUB_ENV
|
||||
clang++*)
|
||||
echo CC=`echo $compiler | sed s/++//` >> $GITHUB_ENV
|
||||
echo CXX="$compiler -stdlib=libc++" >> $GITHUB_ENV
|
||||
echo LD=$compiler >> $GITHUB_ENV
|
||||
|
||||
allow_warn_opt="-Wno-error=#warnings"
|
||||
;;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue