gh-actions: adapt to currently available compiler versions

[awesomized/libmemcached] / .github / workflows / cmake-build-ci.gen

diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen
index 3be65a17a9ecd47eb137658e116aba2da1189027..e3031cb4b8c5716c8cb2ae7cbdd77184e47330a7 100755 (executable)
--- a/.github/workflows/cmake-build-ci.gen
+++ b/.github/workflows/cmake-build-ci.gen
@@ -40,14 +40,13 @@ const MAP = [
           'env.CC_VER' => [
             "new"  => "-10",
             "cur"  => "-9",
-            "old"  => "-8"
           ]
         ],
         "clang" => [
           'env.CC_VER' => [
-            "new"  => "-10",
-            "cur"  => "-9",
-            "old"  => "-8"
+            "new"  => "-11",
+            "cur"  => "-10",
+            "old"  => "-9"
           ]
         ]
       ]
@@ -56,16 +55,14 @@ const MAP = [
       'env.CC_VND' => [
         "gnu" => [
           'env.CC_VER' => [
-            "new"  => "-9",
-            "cur"  => "-8",
+            "new"  => "-10",
+            "cur"  => "-9",
             "old"  => "-7"
           ]
         ],
         "clang" => [
           'env.CC_VER' => [
-            "new"  => "-9",
-            "cur"  => "-8",
-            "old"  => "-6.0"
+            "cur"  => "-9",
           ]
         ]
       ]
@@ -226,7 +223,7 @@ function steps_getdeps($os_vnd) {
 function steps_build() {
 ?>
       - name: Generate build tree (${{ env.CMAKE_BUILD_TYPE }})
-        run: cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
+        run: cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
       - name: Build all with ${{ env.CXX }} ${{ env.CXXFLAGS }}
         run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2
 <?php
@@ -253,7 +250,7 @@ function steps_package() {
           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  ')
         run: |
-          cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
+          cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
           cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
           cmake -DCPACK_COMPONENT_INSTALL=ON build
           cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package