X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=.github%2Fworkflows%2Fcmake-build-ci.gen;h=50e1e50552fb873f9fe1ba404891bf68786fd228;hb=6e8df95620d6c79a55d1f6996260303694026370;hp=251c4e3e5695dd2509e843e116de8d20ec2d5236;hpb=7551432de95d770e33905a6c98f4c00aea6537ad;p=awesomized%2Flibmemcached

diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen
index 251c4e3e..50e1e505 100755
--- 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"  => "-12",
+            "cur"  => "-11",
+            "old"  => "-10"
           ]
         ]
       ]
@@ -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",
           ]
         ]
       ]
@@ -74,23 +71,18 @@ const MAP = [
 ];
 const ENV = [
   "ubuntu-20.04" => [
-    "gnu" => [
-      "new" => [
-        "INSTALL_CC" => "gcc-10",
-        "INSTALL_CXX" => "g++-10",
-      ]
-    ],
     "clang" => [
       "new" => [
-        "CXXFLAGS" => "-stdlib=libc++"
+        "CXXFLAGS" => "-stdlib=libc++",
+        "INSTALL_CXX" => "libc++-12-dev libc++abi-12-dev"
       ],
       "cur" => [
         "CXXFLAGS" => "-stdlib=libc++",
-        "INSTALL_CXX" => "libc++-9-dev libc++abi-9-dev"
+        "INSTALL_CXX" => "libc++-11-dev libc++abi-11-dev"
       ],
       "old" => [
         "CXXFLAGS" => "-stdlib=libc++",
-        "INSTALL_CXX" => "libc++-8-dev libc++abi-8-dev"
+        "INSTALL_CXX" => "libc++-10-dev libc++abi-10-dev"
       ],
     ]
   ],
@@ -119,6 +111,7 @@ function steps_setenv($os_vnd, $splat_map = null) {
         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
+          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'
         run: |
@@ -253,7 +246,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