From 8168f9aea0e406caa756ed98996154907eb100b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Borz=C3=AC?= Date: Sun, 16 May 2021 02:25:29 +0200 Subject: [PATCH] fix(CI): replace clang-9 with clang-8 (#5877) --- .github/workflows/core_build.yml | 2 +- apps/ci/ci-conf.sh | 6 ++++++ apps/ci/ci-install.sh | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/core_build.yml b/.github/workflows/core_build.yml index 90ede0c88..d54fd1031 100644 --- a/.github/workflows/core_build.yml +++ b/.github/workflows/core_build.yml @@ -26,7 +26,7 @@ jobs: modules: without extra_logs: false - os: ubuntu-20.04 - compiler: clang9 + compiler: clang8 modules: without extra_logs: false - os: ubuntu-18.04 diff --git a/apps/ci/ci-conf.sh b/apps/ci/ci-conf.sh index 0d06410dc..b853f50a8 100644 --- a/apps/ci/ci-conf.sh +++ b/apps/ci/ci-conf.sh @@ -53,6 +53,12 @@ case $COMPILER in echo "CCOMPILERCXX=\"clang++-6.0\"" >> ./conf/config.sh ;; + "clang8" ) + time sudo apt-get install -y clang-8 + echo "CCOMPILERC=\"clang-8\"" >> ./conf/config.sh + echo "CCOMPILERCXX=\"clang++-8\"" >> ./conf/config.sh + ;; + "clang9" ) time sudo apt-get install -y clang-9 echo "CCOMPILERC=\"clang-9\"" >> ./conf/config.sh diff --git a/apps/ci/ci-install.sh b/apps/ci/ci-install.sh index cc0681533..14d3395e8 100644 --- a/apps/ci/ci-install.sh +++ b/apps/ci/ci-install.sh @@ -58,6 +58,12 @@ case $COMPILER in echo "CCOMPILERCXX=\"clang++-6.0\"" >> ./conf/config.sh ;; + "clang8" ) + time sudo apt-get install -y clang-8 + echo "CCOMPILERC=\"clang-8\"" >> ./conf/config.sh + echo "CCOMPILERCXX=\"clang++-8\"" >> ./conf/config.sh + ;; + "clang9" ) time sudo apt-get install -y clang-9 echo "CCOMPILERC=\"clang-9\"" >> ./conf/config.sh