X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=.github%2Fworkflows%2Fcmake-build-ci.gen;h=3a914d32b0cf3b279c6eab7c62c7fb17c7c98398;hb=07b607fbff435d2be8375e23855eb0fb25d4e8d9;hp=2d5a6b72773520ddcd6352a7eb94b86e46943a21;hpb=fc38ee40136ea17ee4f1fb679042a786cadefba9;p=awesomized%2Flibmemcached

diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen
index 2d5a6b72..3a914d32 100755
--- a/.github/workflows/cmake-build-ci.gen
+++ b/.github/workflows/cmake-build-ci.gen
@@ -64,7 +64,7 @@ const MAP = [
           'env.CC_VER' => [
             "new"  => "-9",
             "cur"  => "-8",
-            "old"  => "-6.0"
+            // old => "-6.0" ### skip
           ]
         ]
       ]
@@ -89,14 +89,15 @@ function steps($splat_map = null) {
 ?>
 <?=PRE?> - name: Prepare environment (<?= "for $cc_ver $cc_vnd on $os_ver" ?>)
 <?=PRE?>   if: (<?="$os_is=='$os_ver') && ($cc_vnd_is=='$cc_vnd') && ($cc_ver_is=='$cc_ver'"?>)
-<?=PRE?>   run: echo CC=<?=DEF[$cc_vnd]["CC"] . $ver?> >> ${GITHUB_ENV}
-<?=PRE?>   run: echo CXX=<?=DEF[$cc_vnd]["CXX"] . $ver?> >> ${GITHUB_ENV}
+<?=PRE?>   run: |
+<?=PRE?>     echo CC=<?=DEF[$cc_vnd]["CC"] . $ver?> >> ${GITHUB_ENV}
+<?=PRE?>     echo CXX=<?=DEF[$cc_vnd]["CXX"] . $ver?> >> ${GITHUB_ENV}
 <?php
                 if (isset(APT[$os_ver][$cc_vnd][$cc_ver])) {
                   $dep = APT[$os_ver][$cc_vnd][$cc_ver];
 ?>
-<?=PRE?>   run: echo INSTALL_CC='<?=$dep["CC"]?>' >> ${GITHUB_ENV}
-<?=PRE?>   run: echo INSTALL_CXX='<?=$dep["CXX"]?>' >> ${GITHUB_ENV}
+<?=PRE?>     echo INSTALL_CC='<?=$dep["CC"]?>' >> ${GITHUB_ENV}
+<?=PRE?>     echo INSTALL_CXX='<?=$dep["CXX"]?>' >> ${GITHUB_ENV}
 <?php
                 }
               }
@@ -109,9 +110,8 @@ function steps($splat_map = null) {
 ?>
 <?=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?>   run: sudo apt-get install libevent-dev libsasl2-dev ${INSTALL_MEMCACHED} ${INSTALL_CC} ${INSTALL_CXX}
 <?=PRE?> - name: Generate build tree (${CMAKE_CONFIG_TYPE})
-<?=PRE?>   run: mkdir build
 <?=PRE?>   run: cmake -S . -B build
 <?=PRE?> - name: Build all with ${CXX} ${CXXFLAGS}
 <?=PRE?>   run: make -C build -j2 all
@@ -163,10 +163,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     env:
       CMAKE_CONFIG_TYPE: Release
+      OS_VND: Linux
+      OS_VER: ${{ matrix.os }}
       CC_VND: ${{ matrix.compiler_vendor }}
       CC_VER: ${{ matrix.compiler_version }}
-      OS_VND: ${{ runner.os }}
-      OS_VER: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
 <?php steps(true); ?>
@@ -208,6 +208,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           repository: memcached/memcached
+          path: memcached
           ref: 1.6.7
       - name: Build memcached
         run: |
@@ -217,5 +218,5 @@ jobs:
           make -j2
           make install
           cd ..
-      <?php steps(); ?>
+<?php steps(); ?>