From 7d311a4fa5707ff5a6235075e5cef6b094031b80 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Tue, 21 Feb 2023 13:48:11 +0100 Subject: [PATCH] ci/github: clang-12 on ubuntu-22.04 is unable to find libunwind --- .github/workflows/cmake-build-ci.gen | 5 ----- .github/workflows/cmake-build-ci.yml | 7 ------- 2 files changed, 12 deletions(-) diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen index 9bc92a43..a27290a3 100755 --- a/.github/workflows/cmake-build-ci.gen +++ b/.github/workflows/cmake-build-ci.gen @@ -47,7 +47,6 @@ const MAP = [ 'env.CC_VER' => [ "new" => "-14", "cur" => "-13", - "old" => "-12" ] ] ] @@ -82,10 +81,6 @@ const ENV = [ "CXXFLAGS" => "-stdlib=libc++", "INSTALL_CXX" => "libc++-13-dev libc++abi-13-dev" ], - "old" => [ - "CXXFLAGS" => "-stdlib=libc++", - "INSTALL_CXX" => "libc++-12-dev libc++abi-12-dev" - ], ] ], "ubuntu-20.04" => [ diff --git a/.github/workflows/cmake-build-ci.yml b/.github/workflows/cmake-build-ci.yml index e9d41122..9d8e0c4e 100644 --- a/.github/workflows/cmake-build-ci.yml +++ b/.github/workflows/cmake-build-ci.yml @@ -467,13 +467,6 @@ jobs: echo CXX="clang++-13" >> ${GITHUB_ENV} echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV} echo INSTALL_CXX="libc++-13-dev libc++abi-13-dev" >> ${GITHUB_ENV} - - name: Prepare environment (for old clang on ubuntu-22.04) - if: (env.OS_VER=='ubuntu-22.04') && (env.CC_VND=='clang') && (env.CC_VER=='old') - run: | - echo CC="clang-12" >> ${GITHUB_ENV} - echo CXX="clang++-12" >> ${GITHUB_ENV} - echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV} - echo INSTALL_CXX="libc++-12-dev libc++abi-12-dev" >> ${GITHUB_ENV} - name: Prepare environment (for new gnu on ubuntu-20.04) if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='gnu') && (env.CC_VER=='new') run: | -- 2.30.2