X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=.github%2Fworkflows%2Fcmake-build-ci.gen;h=93e06dd22da6c1ab3b528497bae2f837a97eeec2;hb=ec783a984d98aac9265b98db6ef65bfeff216afc;hp=6b7a35a08da8b8ea2d1b48da296bbc7b84350a5e;hpb=535d72acf1ce7cae403fd05189d5b0e141b4bad3;p=m6w6%2Flibmemcached

diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen
index 6b7a35a0..93e06dd2 100755
--- a/.github/workflows/cmake-build-ci.gen
+++ b/.github/workflows/cmake-build-ci.gen
@@ -75,7 +75,7 @@ const MAP = [
 /**
  * @var bool $splat_map false = no splat map, null = default splat map, true = full splat map
  */
-function steps($splat_map = null) {
+function steps_setenv($splat_map = null) {
   if ($splat_map !== false) {
     foreach (MAP as $os_is => $os_vers) {
       foreach ($os_vers as $os_ver => $cc_vnds_) {
@@ -107,13 +107,21 @@ function steps($splat_map = null) {
       }
     }
   }
+}
+
+function steps_getdeps() {
 ?>
 <?=PRE?> - name: Install dependencies
 <?=PRE?>   if: runner.os == 'Linux'
-<?=PRE?>   run: sudo apt-get install libevent-dev libsasl-dev ${INSTALL_MEMCACHED} ${INSTALL_CC} ${INSTALL_CXX}
-<?=PRE?> - name: Generate build tree (${CMAKE_CONFIG_TYPE})
+<?=PRE?>   run: sudo apt-get install libevent-dev libsasl2-dev ${INSTALL_MEMCACHED} ${INSTALL_CC} ${INSTALL_CXX}
+<?php
+}
+
+function steps_build() {
+?>
+<?=PRE?> - name: Generate build tree (${{ env.CMAKE_CONFIG_TYPE }})
 <?=PRE?>   run: cmake -S . -B build
-<?=PRE?> - name: Build all with ${CXX} ${CXXFLAGS}
+<?=PRE?> - name: Build all with ${{ env.CXX }} ${{ env.CXXFLAGS }}
 <?=PRE?>   run: make -C build -j2 all
 <?=PRE?> - name: Test
 <?=PRE?>   run: make -C build -j2 test
@@ -121,10 +129,16 @@ function steps($splat_map = null) {
 <?=PRE?>   run: make -C build -j2 install DESTDIR=.
 <?=PRE?> - name: Failed tests log
 <?=PRE?>   if: ${{ failure() }}
-<?=PRE?>   run: cat Testing/Temporary/LastTest.log
+<?=PRE?>   run: cat build/Testing/Temporary/LastTest.log
 <?php
 }
 
+function steps($splat_map = null) {
+  steps_setenv($splat_map);
+  steps_getdeps();
+  steps_build();
+}
+
 ?>
 name: cmake-build-ci
 on: 
@@ -141,11 +155,11 @@ on:
 env:
   # defaults
   INSTALL_MEMCACHED:  memcached
-  CMAKE_CONFIG_TYPE:  Debug
+  CMAKE_BUILD_TYPE:   Debug
   BUILD_TESTING:      "ON"
-  ENABLE_SASL:        "ON"
+  ENABLE_SASL:        "OFF"
   ENABLE_HASH_HSIEH:  "ON"
-  ENABLE_DTRACE:      "ON"
+  ENABLE_DTRACE:      "OFF"
   VERBOSE:            "ON"
   OS_VND:   <?=DEF["os"]?> #
   OS_VER:   <?=DEF[DEF["os"]]?> #
@@ -156,17 +170,19 @@ jobs:
   # release builds
   ci-rel:
     strategy:
+      fail-fast: false
       matrix:
-        os: [ubuntu-20.04, ubuntu-18.04]
-        compiler_vendor: [gnu, clang]
-        compiler_version: [new, cur, old]
-    runs-on: ${{ matrix.os }}
+        os_ver: [ubuntu-20.04, ubuntu-18.04]
+        cc_vnd: [gnu, clang]
+        cc_ver: [new, cur, old]
+    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 }}
-      CC_VND: ${{ matrix.compiler_vendor }}
-      CC_VER: ${{ matrix.compiler_version }}
+      OS_VER: ${{ matrix.os_ver }}
+      CC_VND: ${{ matrix.cc_vnd }}
+      CC_VER: ${{ matrix.cc_ver }}
     steps:
       - uses: actions/checkout@v2
 <?php steps(true); ?>
@@ -190,6 +206,8 @@ jobs:
       - uses: actions/checkout@v2
 <?php steps(); ?>
       - uses: codecov/codecov-action@v1.0.13
+        with:
+          directory: build/src
 
   # memcached new
   ci-new:
@@ -208,7 +226,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           repository: memcached/memcached
+          path: memcached
           ref: 1.6.7
+<?php steps_setenv(); ?>
+<?php steps_getdeps(); ?>
       - name: Build memcached
         run: |
           cd memcached
@@ -217,5 +238,5 @@ jobs:
           make -j2
           make install
           cd ..
-<?php steps(); ?>
+<?php steps_build(); ?>