- updated continuous integration settings

* Restored Clang 6 target by removing GCC 11 because its libstdc++ cannot be used with older compilers
* Replaced GCC 10 with 11
This commit is contained in:
alexey.lysiuk 2021-05-15 10:36:09 +03:00
parent db8572dbcc
commit ff27edc19c

View file

@ -43,20 +43,20 @@ jobs:
build_type: "RelWithDebInfo" build_type: "RelWithDebInfo"
} }
- { - {
name: "Linux GCC 10", name: "Linux GCC 11",
os: ubuntu-20.04, os: ubuntu-20.04,
extra_options: "-DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10", extra_options: "-DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11",
deps_cmdline: "sudo apt update && sudo apt install g++-10 libsdl2-dev libvpx-dev libgtk-3-dev", deps_cmdline: "sudo apt update && sudo apt install g++-11 libsdl2-dev libvpx-dev libgtk-3-dev",
build_type: "MinSizeRel" build_type: "MinSizeRel"
} }
# - { - {
# name: "Linux Clang 6", name: "Linux Clang 6",
# os: ubuntu-20.04, os: ubuntu-20.04,
# extra_options: "-DCMAKE_C_COMPILER=clang-6.0 -DCMAKE_CXX_COMPILER=clang++-6.0 \ extra_options: "-DCMAKE_C_COMPILER=clang-6.0 -DCMAKE_CXX_COMPILER=clang++-6.0 \
# -DDYN_FLUIDSYNTH=OFF -DDYN_OPENAL=OFF -DDYN_SNDFILE=OFF -DDYN_MPG123=OFF", -DDYN_FLUIDSYNTH=OFF -DDYN_OPENAL=OFF -DDYN_SNDFILE=OFF -DDYN_MPG123=OFF",
# deps_cmdline: "sudo apt update && sudo apt install clang-6.0 libsdl2-dev libvpx-dev libopenal-dev libfluidsynth-dev libmpg123-dev libsndfile1-dev", deps_cmdline: "sudo apt update && sudo apt remove gcc-11 libgcc-11-dev g++-11 libstdc++-11-dev && sudo apt install clang-6.0 libstdc++-9-dev libsdl2-dev libvpx-dev libopenal-dev libfluidsynth-dev libmpg123-dev libsndfile1-dev",
# build_type: "Debug" build_type: "Debug"
# } }
- { - {
name: "Linux Clang 11", name: "Linux Clang 11",
os: ubuntu-20.04, os: ubuntu-20.04,