X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=.github%2Fworkflows%2Fcmake-build-ci.gen;h=8d75802a9bf0fbc2fc955883e5b2218397143164;hb=71cde68dd555327eec59f418ad80e44903d76a05;hp=5bc59222a6c9f4f32689a9c78c0862fe23e433cd;hpb=829c896a0615292cdd0b260f74165839a1ec5151;p=awesomized%2Flibmemcached

diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen
index 5bc59222..8d75802a 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 libsasl2-dev ${INSTALL_MEMCACHED} ${INSTALL_CC} ${INSTALL_CXX}
-<?=PRE?> - name: Generate build tree (${CMAKE_CONFIG_TYPE})
+<?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
@@ -125,6 +133,12 @@ function steps($splat_map = null) {
 <?php
 }
 
+function steps($splat_map = null) {
+  steps_setenv($splat_map);
+  steps_getdeps();
+  steps_build();
+}
+
 ?>
 name: cmake-build-ci
 on: 
@@ -143,9 +157,9 @@ env:
   INSTALL_MEMCACHED:  memcached
   CMAKE_CONFIG_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,6 +170,7 @@ jobs:
   # release builds
   ci-rel:
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-20.04, ubuntu-18.04]
         compiler_vendor: [gnu, clang]
@@ -208,7 +223,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 +235,5 @@ jobs:
           make -j2
           make install
           cd ..
-<?php steps(); ?>
+<?php steps_build(); ?>