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

diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen
index 1e268f6a..50e1e505 100755
--- a/.github/workflows/cmake-build-ci.gen
+++ b/.github/workflows/cmake-build-ci.gen
@@ -32,40 +32,6 @@ const DEF = [
     "CXX" => "mingw",
   ]
 ];
-const ENV = [
-  "ubuntu-20.04" => [
-    "gnu" => [
-      "new" => [
-        "INSTALL_CC" => "gcc-10",
-        "INSTALL_CXX" => "g++-10",
-      ]
-    ],
-    "clang" => [
-      "new" => [
-        "CXXFLAGS" => "-stdlib=libc++"
-      ],
-      "cur" => [
-        "CXXFLAGS" => "-stdlib=libc++"
-      ],
-      "old" => [
-        "CXXFLAGS" => "-stdlib=libc++"
-      ],
-    ]
-  ],
-  "ubuntu-18.04" => [
-    "clang" => [
-      "new" => [
-        "CXXFLAGS" => "-stdlib=libc++"
-      ],
-      "cur" => [
-        "CXXFLAGS" => "-stdlib=libc++"
-      ],
-      "old" => [
-        "CXXFLAGS" => "-stdlib=libc++"
-      ],
-    ]
-  ]
-];
 const MAP = [
   'env.OS_VER' => [
     "ubuntu-20.04" => [
@@ -74,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"
           ]
         ]
       ]
@@ -90,22 +55,51 @@ 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",
           ]
         ]
       ]
     ],
   ]
 ];
+const ENV = [
+  "ubuntu-20.04" => [
+    "clang" => [
+      "new" => [
+        "CXXFLAGS" => "-stdlib=libc++",
+        "INSTALL_CXX" => "libc++-12-dev libc++abi-12-dev"
+      ],
+      "cur" => [
+        "CXXFLAGS" => "-stdlib=libc++",
+        "INSTALL_CXX" => "libc++-11-dev libc++abi-11-dev"
+      ],
+      "old" => [
+        "CXXFLAGS" => "-stdlib=libc++",
+        "INSTALL_CXX" => "libc++-10-dev libc++abi-10-dev"
+      ],
+    ]
+  ],
+  "ubuntu-18.04" => [
+    "clang" => [
+      "new" => [
+        "CXXFLAGS" => "-stdlib=libc++"
+      ],
+      "cur" => [
+        "CXXFLAGS" => "-stdlib=libc++"
+      ],
+      "old" => [
+        "CXXFLAGS" => "-stdlib=libc++"
+      ],
+    ]
+  ]
+];
 
 /**
  * @var bool $splat_map false = no splat map, null = default splat map, true = full splat map
@@ -117,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: |
@@ -163,6 +158,7 @@ function steps_getdeps($os_vnd) {
   if ($os_vnd === "Linux") :
 ?>
         run: |
+          sudo apt-get update -y
           sudo apt-get install -my \
             libevent-dev \
             libsasl2-dev \
@@ -223,7 +219,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
@@ -248,9 +244,9 @@ function steps_package() {
       - name: Package
         env:
           PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }}
-        if: 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' && !(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
@@ -261,7 +257,10 @@ function steps_package() {
 function steps_notify($os_vnd) {
 ?>
       - name: Notify Gitter
-        run: bash .github/notify-gitter.sh ${{ secrets.GITTER }} ${{ job.status }}
+        env:
+          GITTER: ${{ secrets.GITTER }}
+        if: (success() || failure()) && env.GITTER != ''
+        run: bash .github/notify-gitter.sh ${{ job.status }}
 <?php
 }
 
@@ -294,15 +293,18 @@ function env_override($os_vnd, $cc_vnd = null) {
 ?>
 name: cmake-build-ci
 on:
+  workflow_dispatch:
+  release:
+    types: [published]
   push:
     paths:
+      - ".github/workflows/cmake-build-ci*"
+      - "CMake*"
+      - "CPack*"
       - "contrib/**"
       - "include/**"
       - "src/**"
       - "test/**"
-      - "CMake*"
-      - "CPack*"
-      - ".github/workflows/cmake-build-ci*"
     branches-ignore:
       - gh-pages
   pull_request: