From bde5648bce7d87e7ac22b403db49186d3a7a15e6 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Fri, 2 Oct 2020 18:14:04 +0200 Subject: [PATCH] clang-7 as old for bionic instead of 6 --- .github/workflows/cmake-build-ci.gen | 10 +++++++++- .github/workflows/cmake-build-ci.yml | 6 ++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen index 93e06dd2..8d1dc993 100755 --- a/.github/workflows/cmake-build-ci.gen +++ b/.github/workflows/cmake-build-ci.gen @@ -29,6 +29,14 @@ const APT = [ "CXX" => "g++-10", ] ] + ], + "ubuntu-18.04" => [ + "clang" => [ + "old" => [ + "CC" => "clang-7", + "CXX" => "clang-7" + ] + ] ] ]; const MAP = [ @@ -64,7 +72,7 @@ const MAP = [ 'env.CC_VER' => [ "new" => "-9", "cur" => "-8", - "old" => "-6.0" + "old" => "-7" ] ] ] diff --git a/.github/workflows/cmake-build-ci.yml b/.github/workflows/cmake-build-ci.yml index 6d045ee1..1c2d355e 100644 --- a/.github/workflows/cmake-build-ci.yml +++ b/.github/workflows/cmake-build-ci.yml @@ -104,8 +104,10 @@ jobs: - name: Prepare environment (for old clang on ubuntu-18.04) if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='clang') && (env.CC_VER=='old') run: | - echo CC=clang-6.0 >> ${GITHUB_ENV} - echo CXX=clang++-6.0 >> ${GITHUB_ENV} + echo CC=clang-7 >> ${GITHUB_ENV} + echo CXX=clang++-7 >> ${GITHUB_ENV} + echo INSTALL_CC='clang-7' >> ${GITHUB_ENV} + echo INSTALL_CXX='clang-7' >> ${GITHUB_ENV} - name: Install dependencies if: runner.os == 'Linux' run: sudo apt-get install libevent-dev libsasl2-dev ${INSTALL_MEMCACHED} ${INSTALL_CC} ${INSTALL_CXX} -- 2.30.2