From 047a738b0951436decea55dd049615c2f442a2fe Mon Sep 17 00:00:00 2001 From: Bernhard Manfred Gruber Date: Tue, 30 Nov 2021 08:23:30 +0100 Subject: [PATCH] Add clang-13 to CI Fixes #1476 --- .github/workflows/ci.yml | 3 +++ script/install_clang.sh | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 463a79be4213..219e498e2207 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -221,6 +221,9 @@ jobs: - name: linux_clang-12_release os: ubuntu-latest env: {CXX: clang++, CC: clang, ALPAKA_CI_CLANG_VER: 12, ALPAKA_CI_STDLIB: libc++, CMAKE_BUILD_TYPE: Release, ALPAKA_CI_BOOST_BRANCH: boost-1.76.0, ALPAKA_CI_CMAKE_VER: 3.21.1, OMP_NUM_THREADS: 4, ALPAKA_CI_DOCKER_BASE_IMAGE_NAME: "ubuntu:20.04", ALPAKA_ACC_CPU_B_TBB_T_SEQ_ENABLE: OFF, CMAKE_CXX_EXTENSIONS: OFF} + - name: linux_clang-13_debug + os: ubuntu-latest + env: {CXX: clang++, CC: clang, ALPAKA_CI_CLANG_VER: 13, ALPAKA_CI_STDLIB: libstdc++, CMAKE_BUILD_TYPE: Debug, ALPAKA_CI_BOOST_BRANCH: boost-1.74.0, ALPAKA_CI_CMAKE_VER: 3.20.0, OMP_NUM_THREADS: 3, ALPAKA_CI_DOCKER_BASE_IMAGE_NAME: "ubuntu:20.04", CMAKE_CXX_EXTENSIONS: OFF} # icpc - name: linux_icpc_release diff --git a/script/install_clang.sh b/script/install_clang.sh index 8fd927ac17bd..c92361888cf2 100755 --- a/script/install_clang.sh +++ b/script/install_clang.sh @@ -18,7 +18,7 @@ source ./script/set.sh : "${ALPAKA_CI_STDLIB?'ALPAKA_CI_STDLIB must be specified'}" : "${CXX?'CXX must be specified'}" -# add clang-11 reposetory for ubuntu 18.04 +# add clang-11 repository for ubuntu 18.04 if [[ "$(cat /etc/os-release)" == *"18.04"* && "${ALPAKA_CI_CLANG_VER}" -eq 11 ]] then travis_retry sudo DEBIAN_FRONTEND=noninteractive apt-get -y --quiet --allow-unauthenticated --no-install-recommends install tzdata @@ -29,6 +29,13 @@ then travis_retry apt-get -y --quiet update fi +# add clang-13 repository for ubuntu 20.04 +if [[ "$(cat /etc/os-release)" == *"20.04"* && "${ALPAKA_CI_CLANG_VER}" -eq 13 ]] +then + wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - + sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main' +fi + travis_retry sudo apt-get -y --quiet --allow-unauthenticated --no-install-recommends install clang-${ALPAKA_CI_CLANG_VER} if [ "${ALPAKA_CI_STDLIB}" == "libc++" ]