From 16d4971a99661ed8572c8bc403be79ccf319d334 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Tue, 21 Feb 2023 12:42:41 +0100 Subject: [PATCH] ci: gh-actions: update linux --- .github/workflows/cmake-build-ci.gen | 38 +++++++++++++++++- .github/workflows/cmake-build-ci.yml | 60 ++++++++++++++++++++++------ 2 files changed, 84 insertions(+), 14 deletions(-) diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen index 50e1e505..a7164e09 100755 --- a/.github/workflows/cmake-build-ci.gen +++ b/.github/workflows/cmake-build-ci.gen @@ -5,10 +5,10 @@ echo "# Generated file; do not edit!\n"; const DEF = [ "os" => "Linux", - "Linux" => "ubuntu-20.04", + "Linux" => "ubuntu-22.04", "Windows" => "windows-2019", "macOS" => "macos-10.15", - "ubuntu-20.04" => "gnu", + "ubuntu-22.04" => "gnu", "windows-2019" => "msvc", "macos-10.15" => "clang", "gnu" => [ @@ -34,6 +34,24 @@ const DEF = [ ]; const MAP = [ 'env.OS_VER' => [ + "ubuntu-22.04" => [ + 'env.CC_VND' => [ + "gnu" => [ + 'env.CC_VER' => [ + "new" => "-12", + "cur" => "-11", + "old" => "-10", + ] + ], + "clang" => [ + 'env.CC_VER' => [ + "new" => "-14", + "cur" => "-13", + "old" => "-12" + ] + ] + ] + ], "ubuntu-20.04" => [ 'env.CC_VND' => [ "gnu" => [ @@ -70,6 +88,22 @@ const MAP = [ ] ]; const ENV = [ + "ubuntu-22.04" => [ + "clang" => [ + "new" => [ + "CXXFLAGS" => "-stdlib=libc++", + "INSTALL_CXX" => "libc++-14-dev libc++abi-14-dev" + ], + "cur" => [ + "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" => [ "clang" => [ "new" => [ diff --git a/.github/workflows/cmake-build-ci.yml b/.github/workflows/cmake-build-ci.yml index 7ad9ad25..ed811a67 100644 --- a/.github/workflows/cmake-build-ci.yml +++ b/.github/workflows/cmake-build-ci.yml @@ -26,7 +26,7 @@ env: ENABLE_HASH_HSIEH: "ON" ENABLE_DTRACE: "OFF" OS_VND: Linux # - OS_VER: ubuntu-20.04 # + OS_VER: ubuntu-22.04 # CC_VND: gnu # CC_VER: cur # @@ -34,8 +34,8 @@ jobs: # new memcached dbg-new: - name: dbg-new (ubuntu-20.04, gnu, cur) - runs-on: ubuntu-20.04 # + name: dbg-new (ubuntu-22.04, gnu, cur) + runs-on: ubuntu-22.04 # env: CMAKE_BUILD_TYPE: "Debug" BUILD_TESTING: "ON" @@ -52,11 +52,11 @@ jobs: repository: memcached/memcached path: memcached ref: 1.6.7 - - name: Prepare environment (for cur gnu on ubuntu-20.04) - if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='gnu') && (env.CC_VER=='cur') + - name: Prepare environment (for cur gnu on ubuntu-22.04) + if: (env.OS_VER=='ubuntu-22.04') && (env.CC_VND=='gnu') && (env.CC_VER=='cur') run: | - echo CC="gcc-9" >> ${GITHUB_ENV} - echo CXX="g++-9" >> ${GITHUB_ENV} + echo CC="gcc-11" >> ${GITHUB_ENV} + echo CXX="g++-11" >> ${GITHUB_ENV} - name: Install dependencies (Linux) if: runner.os == 'Linux' run: | @@ -123,7 +123,7 @@ jobs: # sanitizer build sanitizer: - runs-on: ubuntu-20.04 # + runs-on: ubuntu-22.04 # strategy: matrix: sanitizer: ['address;undefined', 'thread'] @@ -134,11 +134,11 @@ jobs: ENABLE_SANITIZERS: ${{ matrix.sanitizer }} steps: - uses: actions/checkout@v2 - - name: Prepare environment (for cur gnu on ubuntu-20.04) - if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='gnu') && (env.CC_VER=='cur') + - name: Prepare environment (for cur gnu on ubuntu-22.04) + if: (env.OS_VER=='ubuntu-22.04') && (env.CC_VND=='gnu') && (env.CC_VER=='cur') run: | - echo CC="gcc-9" >> ${GITHUB_ENV} - echo CXX="g++-9" >> ${GITHUB_ENV} + echo CC="gcc-11" >> ${GITHUB_ENV} + echo CXX="g++-11" >> ${GITHUB_ENV} - name: Install dependencies (Linux) if: runner.os == 'Linux' run: | @@ -438,6 +438,42 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 + - name: Prepare environment (for new gnu on ubuntu-22.04) + if: (env.OS_VER=='ubuntu-22.04') && (env.CC_VND=='gnu') && (env.CC_VER=='new') + run: | + echo CC="gcc-12" >> ${GITHUB_ENV} + echo CXX="g++-12" >> ${GITHUB_ENV} + - name: Prepare environment (for cur gnu on ubuntu-22.04) + if: (env.OS_VER=='ubuntu-22.04') && (env.CC_VND=='gnu') && (env.CC_VER=='cur') + run: | + echo CC="gcc-11" >> ${GITHUB_ENV} + echo CXX="g++-11" >> ${GITHUB_ENV} + - name: Prepare environment (for old gnu on ubuntu-22.04) + if: (env.OS_VER=='ubuntu-22.04') && (env.CC_VND=='gnu') && (env.CC_VER=='old') + run: | + echo CC="gcc-10" >> ${GITHUB_ENV} + echo CXX="g++-10" >> ${GITHUB_ENV} + - name: Prepare environment (for new clang on ubuntu-22.04) + if: (env.OS_VER=='ubuntu-22.04') && (env.CC_VND=='clang') && (env.CC_VER=='new') + run: | + echo CC="clang-14" >> ${GITHUB_ENV} + echo CXX="clang++-14" >> ${GITHUB_ENV} + echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV} + echo INSTALL_CXX="libc++-14-dev libc++abi-14-dev" >> ${GITHUB_ENV} + - name: Prepare environment (for cur clang on ubuntu-22.04) + if: (env.OS_VER=='ubuntu-22.04') && (env.CC_VND=='clang') && (env.CC_VER=='cur') + run: | + echo CC="clang-13" >> ${GITHUB_ENV} + 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