X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=.github%2Fworkflows%2Fcmake-build-ci.gen;h=24df2d8b036d7a3436a05649bf9cd30491b166cf;hb=4fb1e0004ec9410c65bc5b6e8a8d9089b6e2f01f;hp=dd5ae2e0235ba48d1f6318d4afcfc9759cce2579;hpb=d5f5c1f9dcb1da3cd89ca6b14b87af5d9630991b;p=awesomized%2Flibmemcached

diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen
index dd5ae2e0..24df2d8b 100755
--- a/.github/workflows/cmake-build-ci.gen
+++ b/.github/workflows/cmake-build-ci.gen
@@ -29,6 +29,14 @@ const APT = [
         "CXX" => "g++-10",
       ]
     ]
+  ],
+  "ubuntu-18.04" => [
+    "clang" => [
+      "old" => [
+        "CC" => "clang-7",
+        "CXX" => "clang-7"
+      ]
+    ]
   ]
 ];
 const MAP = [
@@ -64,7 +72,7 @@ const MAP = [
           'env.CC_VER' => [
             "new"  => "-9",
             "cur"  => "-8",
-            "old"  => "-6.0"
+            "old"  => "-7"
           ]
         ]
       ]
@@ -141,21 +149,21 @@ function steps($splat_map = null) {
 
 ?>
 name: cmake-build-ci
-on: 
+on:
   push:
-    paths-ignore: 
+    paths-ignore:
       - "docs/**"
-    branches-ignore: 
+    branches-ignore:
       - gh-pages
       - v1.x
   pull_request:
-    branches: 
+    branches:
       - master
       - v1.x
 env:
   # defaults
   INSTALL_MEMCACHED:  memcached
-  CMAKE_CONFIG_TYPE:  Debug
+  CMAKE_BUILD_TYPE:   Debug
   BUILD_TESTING:      "ON"
   ENABLE_SASL:        "OFF"
   ENABLE_HASH_HSIEH:  "ON"
@@ -178,7 +186,7 @@ jobs:
     runs-on: ${{ matrix.os_ver }}
     continue-on-error: ${{ matrix.cc_vnd == 'clang' }}
     env:
-      CMAKE_CONFIG_TYPE: Release
+      CMAKE_BUILD_TYPE: Release
       OS_VND: Linux
       OS_VER: ${{ matrix.os_ver }}
       CC_VND: ${{ matrix.cc_vnd }}
@@ -192,7 +200,7 @@ jobs:
     runs-on: <?=DEF[DEF["os"]]?> #
     env:
       ENABLE_SANITIZERS: "address;undefined"
-    steps: 
+    steps:
       - uses: actions/checkout@v2
 <?php steps(); ?>
 
@@ -200,9 +208,9 @@ jobs:
   ci-cov:
     runs-on: <?=DEF[DEF["os"]]?> #
     env:
-      CFLAGS: --coverage
-      CXXFLAGS: --coverage
-    steps: 
+      CFLAGS: -O0 --coverage
+      CXXFLAGS: -O0 --coverage
+    steps:
       - uses: actions/checkout@v2
 <?php steps(); ?>
       - uses: codecov/codecov-action@v1.0.13
@@ -214,11 +222,7 @@ jobs:
       INSTALL_MEMCACHED:
       MEMCACHED_PREFIX: /tmp
       MEMCACHED_BINARY: /tmp/bin/memcached
-      enable_sasl: yes
-      enable_sasl_pwdb: yes
-      enable_docs: no
-      enable_coverage: no
-      enable_dependency_tracking: no
+      ENABLE_SASL:      "ON"
     steps:
       - uses: actions/checkout@v2
       - uses: actions/checkout@v2
@@ -232,9 +236,14 @@ jobs:
         run: |
           cd memcached
           ./autogen.sh
-          ./configure CFLAGS="-O2 -pipe" --prefix=${MEMCACHED_PREFIX}
+          ./configure CFLAGS="-O2 -pipe" \
+            --prefix=${MEMCACHED_PREFIX} \
+            --enable-sasl \
+            --enable-sasl-pwdb \
+            --disable-docs \
+            --disable-coverage \
+            --disable-dependency-tracking
           make -j2
           make install
           cd ..
 <?php steps_build(); ?>
-