From 9d22d315e1c8a8591adb9f05addd26a1f196254c Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Wed, 22 Feb 2023 11:52:56 +0100 Subject: [PATCH] ci/github: expand mac and win builds --- .github/workflows/cmake-build-ci.gen | 251 ++++++++++++++++----------- .github/workflows/cmake-build-ci.yml | 120 +++++++------ 2 files changed, 224 insertions(+), 147 deletions(-) diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen index 99703e79..7697081e 100755 --- a/.github/workflows/cmake-build-ci.gen +++ b/.github/workflows/cmake-build-ci.gen @@ -5,70 +5,98 @@ echo "# Generated file; do not edit!\n"; const DEF = [ "os" => "Linux", - "Linux" => "ubuntu-22.04", - "Windows" => "windows-2019", - "macOS" => "macos-10.15", - "ubuntu-22.04" => "gnu", - "windows-2019" => "msvc", - "macos-10.15" => "clang", + + "Linux" => "ubuntu-22.04", "ubuntu-22.04" => "gnu", + "Windows" => "windows-2022", "windows-2022" => "msvc", + "macOS" => "macos-12", "macos-12" => "clang", + "gnu" => [ - "ver" => "cur", "CC" => "gcc", "CXX" => "g++", ], "clang" => [ - "ver" => "cur", "CC" => "clang", "CXX" => "clang++", ], - "msvc" => [ // dummy - "ver" => "cur", - "CC" => "msvc", - "CXX" => "msvc", + "msvc" => [ + "CMAKE_GENERATOR" => "Visual Studio" ], - "mingw" => [ // dummy - "ver" => "cur", - "CC" => "mingw", - "CXX" => "mingw", + "mingw" => [ + "CMAKE_GENERATOR" => "MinGW Makefiles" ] ]; const MAP = [ - 'env.OS_VER' => [ - "ubuntu-22.04" => [ - 'env.CC_VND' => [ - "gnu" => [ - 'env.CC_VER' => [ - "new" => "-12", - "cur" => "-11", - "old" => "-10", + "Linux" => [ + '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", + ] ] - ], - "clang" => [ - 'env.CC_VER' => [ - "new" => "-14", - "cur" => "-13", + ] + ], + "ubuntu-20.04" => [ + 'env.CC_VND' => [ + "gnu" => [ + 'env.CC_VER' => [ + "new" => "-10", + "cur" => "-9", + ] + ], + "clang" => [ + 'env.CC_VER' => [ + "new" => "-12", + "cur" => "-11", + "old" => "-10" + ] ] ] - ] + ], ], - "ubuntu-20.04" => [ - 'env.CC_VND' => [ - "gnu" => [ - 'env.CC_VER' => [ - "new" => "-10", - "cur" => "-9", + ], + "Windows" => [ + 'env.OS_VER' => [ + "windows-2022" => [ + 'env.CC_VND' => [ + "msvc" => [ + "env.CC_VER" => [ + "cur" => " 17 2022" + ] + ], + "mingw" => [ + "env.CC_VER" => [ + "cur" => "" + ] ] - ], - "clang" => [ - 'env.CC_VER' => [ - "new" => "-12", - "cur" => "-11", - "old" => "-10" + ] + ], + "windows-2019" => [ + 'env.CC_VND' => [ + "msvc" => [ + "env.CC_VER" => [ + "cur" => " 16 2019" + ] + ], + "mingw" => [ + "env.CC_VER" => [ + "cur" => "" + ] ] ] - ] - ], - ] + ], + ] + ], + "macOS" => [] ]; const ENV = [ "ubuntu-22.04" => [ @@ -101,6 +129,32 @@ const ENV = [ ], ]; +function set_addpath($os_vnd, $paths) { + foreach ((array) $paths as $path) if ($os_vnd == "Windows") { +?> + echo "" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + + echo 'PATH="$PATH:"' >> ${GITHUB_ENV} + + echo '=' | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + + echo ="" >> ${GITHUB_ENV} + $os_vers) { + } + if ($splat_map !== false) { + foreach (MAP[$os_vnd] as $os_is => $os_vers) { foreach ($os_vers as $os_ver => $cc_vnds_) { if (!$splat_map && DEF[DEF["os"]] != $os_ver) continue; foreach ($cc_vnds_ as $cc_vnd_is => $cc_vnds) { @@ -126,19 +176,18 @@ function steps_setenv($os_vnd, $splat_map = null) { if (!$splat_map && DEF[DEF[DEF["os"]]] != $cc_vnd) continue; foreach ($cc_vers_ as $cc_ver_is => $cc_vers) { foreach ($cc_vers as $cc_ver => $ver) { - if (!$splat_map && DEF[DEF[DEF[DEF["os"]]]]["ver"] != $cc_ver) continue; + if (!$splat_map && "cur" != $cc_ver) continue; ?> - name: Prepare environment () if: () run: | - echo CC="" >> ${GITHUB_ENV} - echo CXX="" >> ${GITHUB_ENV} $val) { + step_setenv($os_vnd, $env, $val . $ver); + } if (isset(ENV[$os_ver][$cc_vnd][$cc_ver])) { foreach (ENV[$os_ver][$cc_vnd][$cc_ver] as $env => $val) { -?> - echo ="" >> ${GITHUB_ENV} - run: | - brew install bison flex sphinx-doc ${INSTALL_MEMCACHED} + brew install bison flex libevent pkg-config sphinx-doc ${INSTALL_MEMCACHED} brew services stop memcached || true echo MEMCACHED_BINARY="/usr/local/bin/memcached" >> ${GITHUB_ENV} - + bison + flex rsync openssh # OS_VER: # CC_VND: # - CC_VER: # + CC_VER: cur # OS_VER: # CC_VND: # - CC_VER: # + CC_VER: cur jobs: - # coverage - dbg-cov: - name: dbg-cov () - runs-on: # - env: - CMAKE_BUILD_TYPE: "Debug" - BUILD_TESTING: "ON" - VERBOSE: "ON" - CFLAGS: "-O0 --coverage" - CXXFLAGS: "-O0 --coverage" - INSTALL_MEMCACHED: "" - MEMCACHED_PREFIX: "/tmp" - ENABLE_SASL: "ON" - steps: - - uses: actions/checkout@v3 - - uses: actions/checkout@v3 - with: - repository: memcached/memcached - path: memcached - ref: 1.6.7 - - - uses: codecov/codecov-action@v3 - # sanitizer - sanitizer: + debug-sanitizer: + name: debug sanitizer runs-on: # strategy: matrix: @@ -364,7 +392,8 @@ jobs: # memcached - memcached: + debug-memcached: + name: debug memcached runs-on: # continue-on-error: true strategy: @@ -386,9 +415,33 @@ jobs: ref: ${{ matrix.memcached }} - # mac debug - dbg-mac: - name: debug (, , ) +# coverage linux + debug-coverage-linux: + name: debug coverage () + runs-on: # + env: + CMAKE_BUILD_TYPE: "Debug" + BUILD_TESTING: "ON" + VERBOSE: "ON" + CFLAGS: "-O0 --coverage" + CXXFLAGS: "-O0 --coverage" + INSTALL_MEMCACHED: "" + MEMCACHED_PREFIX: "/tmp" + ENABLE_SASL: "ON" + steps: + - uses: actions/checkout@v3 + - uses: actions/checkout@v3 + with: + repository: memcached/memcached + path: memcached + ref: 1.6.7 + + - uses: codecov/codecov-action@v3 + + + # coverage mac + debug-coverage-mac: + name: debug coverage () runs-on: # env: CMAKE_BUILD_TYPE: "Debug" @@ -403,10 +456,14 @@ jobs: - uses: codecov/codecov-action@v3 - # mac release - rel-mac: - name: release (, , ) - runs-on: # + # mac release builds + mac: + name: release + strategy: + fail-fast: false + matrix: + os_ver: [macos-12, macos-11, macos-10.15] + runs-on: ${{ matrix.os_ver }} env: CMAKE_BUILD_TYPE: "Release" BUILD_DOCS_MANGZ: "ON" @@ -424,7 +481,7 @@ jobs: strategy: fail-fast: false matrix: - os_ver: [] + os_ver: [windows-2022, windows-2019] cc_vnd: [msvc, mingw] cc_ver: [cur] runs-on: ${{ matrix.os_ver }} diff --git a/.github/workflows/cmake-build-ci.yml b/.github/workflows/cmake-build-ci.yml index b2fd3393..4c4892de 100644 --- a/.github/workflows/cmake-build-ci.yml +++ b/.github/workflows/cmake-build-ci.yml @@ -28,30 +28,24 @@ env: OS_VND: Linux # OS_VER: ubuntu-22.04 # CC_VND: gnu # - CC_VER: cur # + CC_VER: cur jobs: - # coverage - dbg-cov: - name: dbg-cov (ubuntu-22.04, gnu, cur) + # sanitizer + debug-sanitizer: + name: debug sanitizer runs-on: ubuntu-22.04 # + strategy: + matrix: + sanitizer: ['address;undefined', 'thread'] env: CMAKE_BUILD_TYPE: "Debug" BUILD_TESTING: "ON" VERBOSE: "ON" - CFLAGS: "-O0 --coverage" - CXXFLAGS: "-O0 --coverage" - INSTALL_MEMCACHED: "" - MEMCACHED_PREFIX: "/tmp" - ENABLE_SASL: "ON" + ENABLE_SANITIZERS: ${{ matrix.sanitizer }} steps: - uses: actions/checkout@v3 - - uses: actions/checkout@v3 - with: - repository: memcached/memcached - path: memcached - ref: 1.6.7 - 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: | @@ -108,7 +102,7 @@ jobs: - name: Package env: PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }} - if: env.PUSH_ARTIFACTS_ID != '' && env.CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new ') + if: env.PUSH_ARTIFACTS_ID != '' && env.CMAKE_BUILD_TYPE == 'Release' run: | cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package @@ -120,21 +114,29 @@ jobs: GITTER: ${{ secrets.GITTER }} if: (success() || failure()) && env.GITTER != '' run: bash .github/notify-gitter.sh ${{ job.status }} - - uses: codecov/codecov-action@v3 - # sanitizer - sanitizer: +# memcached + debug-memcached: + name: debug memcached runs-on: ubuntu-22.04 # + continue-on-error: true strategy: matrix: - sanitizer: ['address;undefined', 'thread'] + memcached: ['master', '1.6.17', '1.6.9', '1.5.22', '1.5.6'] env: CMAKE_BUILD_TYPE: "Debug" BUILD_TESTING: "ON" VERBOSE: "ON" - ENABLE_SANITIZERS: ${{ matrix.sanitizer }} + INSTALL_MEMCACHED: "" + MEMCACHED_PREFIX: "/tmp" + ENABLE_SASL: "ON" steps: - uses: actions/checkout@v3 + - uses: actions/checkout@v3 + with: + repository: memcached/memcached + path: memcached + ref: ${{ matrix.memcached }} - 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: | @@ -191,7 +193,7 @@ jobs: - name: Package env: PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }} - if: env.PUSH_ARTIFACTS_ID != '' && env.CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new ') + if: env.PUSH_ARTIFACTS_ID != '' && env.CMAKE_BUILD_TYPE == 'Release' run: | cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package @@ -204,17 +206,16 @@ jobs: if: (success() || failure()) && env.GITTER != '' run: bash .github/notify-gitter.sh ${{ job.status }} -# memcached - memcached: +# coverage linux + debug-coverage-linux: + name: debug coverage (ubuntu-22.04, gnu) runs-on: ubuntu-22.04 # - continue-on-error: true - strategy: - matrix: - memcached: ['master', '1.6.17', '1.6.9', '1.5.22', '1.5.6'] env: CMAKE_BUILD_TYPE: "Debug" BUILD_TESTING: "ON" VERBOSE: "ON" + CFLAGS: "-O0 --coverage" + CXXFLAGS: "-O0 --coverage" INSTALL_MEMCACHED: "" MEMCACHED_PREFIX: "/tmp" ENABLE_SASL: "ON" @@ -224,7 +225,7 @@ jobs: with: repository: memcached/memcached path: memcached - ref: ${{ matrix.memcached }} + ref: 1.6.7 - 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: | @@ -281,7 +282,7 @@ jobs: - name: Package env: PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }} - if: env.PUSH_ARTIFACTS_ID != '' && env.CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new ') + if: env.PUSH_ARTIFACTS_ID != '' && env.CMAKE_BUILD_TYPE == 'Release' run: | cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package @@ -293,11 +294,13 @@ jobs: GITTER: ${{ secrets.GITTER }} if: (success() || failure()) && env.GITTER != '' run: bash .github/notify-gitter.sh ${{ job.status }} + - uses: codecov/codecov-action@v3 + - # mac debug - dbg-mac: - name: debug (macos-10.15, clang, cur) - runs-on: macos-10.15 # + # coverage mac + debug-coverage-mac: + name: debug coverage (macos-12, clang) + runs-on: macos-12 # env: CMAKE_BUILD_TYPE: "Debug" BUILD_TESTING: "ON" @@ -305,16 +308,16 @@ jobs: CFLAGS: "-O0 --coverage" CXXFLAGS: "-O0 --coverage" OS_VND: macOS # - OS_VER: macos-10.15 # + OS_VER: macos-12 # CC_VND: clang # - CC_VER: cur # + CC_VER: cur continue-on-error: true steps: - uses: actions/checkout@v3 - name: Install dependencies (macOS) if: runner.os == 'macOS' run: | - brew install bison flex sphinx-doc ${INSTALL_MEMCACHED} + brew install bison flex libevent pkg-config sphinx-doc ${INSTALL_MEMCACHED} brew services stop memcached || true echo MEMCACHED_BINARY="/usr/local/bin/memcached" >> ${GITHUB_ENV} - name: Build memcached @@ -356,7 +359,7 @@ jobs: - name: Package env: PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }} - if: env.PUSH_ARTIFACTS_ID != '' && env.CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new ') + if: env.PUSH_ARTIFACTS_ID != '' && env.CMAKE_BUILD_TYPE == 'Release' run: | cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package @@ -370,17 +373,21 @@ jobs: run: bash .github/notify-gitter.sh ${{ job.status }} - uses: codecov/codecov-action@v3 - # mac release - rel-mac: - name: release (macos-10.15, clang, cur) - runs-on: macos-10.15 # + # mac release builds + mac: + name: release + strategy: + fail-fast: false + matrix: + os_ver: [macos-12, macos-11, macos-10.15] + runs-on: ${{ matrix.os_ver }} env: CMAKE_BUILD_TYPE: "Release" BUILD_DOCS_MANGZ: "ON" OS_VND: macOS # - OS_VER: macos-10.15 # + OS_VER: macos-12 # CC_VND: clang # - CC_VER: cur # + CC_VER: cur continue-on-error: true steps: - uses: actions/checkout@v3 @@ -389,7 +396,7 @@ jobs: - name: Install dependencies (macOS) if: runner.os == 'macOS' run: | - brew install bison flex sphinx-doc ${INSTALL_MEMCACHED} + brew install bison flex libevent pkg-config sphinx-doc ${INSTALL_MEMCACHED} brew services stop memcached || true echo MEMCACHED_BINARY="/usr/local/bin/memcached" >> ${GITHUB_ENV} - name: Build memcached @@ -431,7 +438,7 @@ jobs: - name: Package env: PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }} - if: env.PUSH_ARTIFACTS_ID != '' && env.CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new ') + if: env.PUSH_ARTIFACTS_ID != '' && env.CMAKE_BUILD_TYPE == 'Release' run: | cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package @@ -450,7 +457,7 @@ jobs: strategy: fail-fast: false matrix: - os_ver: [windows-2019] + os_ver: [windows-2022, windows-2019] cc_vnd: [msvc, mingw] cc_ver: [cur] runs-on: ${{ matrix.os_ver }} @@ -469,9 +476,20 @@ jobs: run: | echo "c:\msys64\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append echo "c:\msys64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + - name: Prepare environment (for cur msvc on windows-2022) + if: (env.OS_VER=='windows-2022') && (env.CC_VND=='msvc') && (env.CC_VER=='cur') + run: | + echo 'CMAKE_GENERATOR=Visual Studio 17 2022' | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + - name: Prepare environment (for cur mingw on windows-2022) + if: (env.OS_VER=='windows-2022') && (env.CC_VND=='mingw') && (env.CC_VER=='cur') + run: | + echo 'CMAKE_GENERATOR=MinGW Makefiles' | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + - name: Prepare environment (for cur msvc on windows-2019) + if: (env.OS_VER=='windows-2019') && (env.CC_VND=='msvc') && (env.CC_VER=='cur') + run: | echo 'CMAKE_GENERATOR=Visual Studio 16 2019' | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - - name: Prepare environment (MinGW) - if: env.CC_VND == 'mingw' + - name: Prepare environment (for cur mingw on windows-2019) + if: (env.OS_VER=='windows-2019') && (env.CC_VND=='mingw') && (env.CC_VER=='cur') run: | echo 'CMAKE_GENERATOR=MinGW Makefiles' | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - name: Install dependencies (Windows) @@ -481,6 +499,8 @@ jobs: release: false path-type: inherit install: >- + bison + flex rsync openssh - name: Generate build tree (${{ env.CMAKE_BUILD_TYPE }}) @@ -499,7 +519,7 @@ jobs: - name: Package env: PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }} - if: env.PUSH_ARTIFACTS_ID != '' && env.CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new ') + if: env.PUSH_ARTIFACTS_ID != '' && env.CMAKE_BUILD_TYPE == 'Release' run: | cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package @@ -644,7 +664,7 @@ jobs: - name: Package env: PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }} - if: env.PUSH_ARTIFACTS_ID != '' && env.CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new ') + if: env.PUSH_ARTIFACTS_ID != '' && env.CMAKE_BUILD_TYPE == 'Release' run: | cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package -- 2.30.2