From: Michael Wallner <mike@php.net>
Date: Fri, 2 Oct 2020 11:13:26 +0000 (+0200)
Subject: update
X-Git-Tag: 1.1.0-beta1~236^2~22^2~19
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=d5f5c1f9dcb1da3cd89ca6b14b87af5d9630991b;p=m6w6%2Flibmemcached

update
---

diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen
index 8d75802a..dd5ae2e0 100755
--- a/.github/workflows/cmake-build-ci.gen
+++ b/.github/workflows/cmake-build-ci.gen
@@ -129,7 +129,7 @@ function steps_build() {
 <?=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
 }
 
@@ -172,16 +172,17 @@ jobs:
     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
       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); ?>
diff --git a/.github/workflows/cmake-build-ci.yml b/.github/workflows/cmake-build-ci.yml
index fdd68008..d1d80961 100644
--- a/.github/workflows/cmake-build-ci.yml
+++ b/.github/workflows/cmake-build-ci.yml
@@ -31,16 +31,17 @@ jobs:
     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
       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
       - name: Prepare environment (for new gnu on ubuntu-20.04)
@@ -118,7 +119,7 @@ jobs:
         run: make -C build -j2 install DESTDIR=.
       - name: Failed tests log
         if: ${{ failure() }}
-        run: cat Testing/Temporary/LastTest.log
+        run: cat build/Testing/Temporary/LastTest.log
 
   # sanitizer build
   ci-san:
@@ -145,7 +146,7 @@ jobs:
         run: make -C build -j2 install DESTDIR=.
       - name: Failed tests log
         if: ${{ failure() }}
-        run: cat Testing/Temporary/LastTest.log
+        run: cat build/Testing/Temporary/LastTest.log
 
   # coverage build
   ci-cov:
@@ -173,7 +174,7 @@ jobs:
         run: make -C build -j2 install DESTDIR=.
       - name: Failed tests log
         if: ${{ failure() }}
-        run: cat Testing/Temporary/LastTest.log
+        run: cat build/Testing/Temporary/LastTest.log
       - uses: codecov/codecov-action@v1.0.13
 
   # memcached new
@@ -221,5 +222,5 @@ jobs:
         run: make -C build -j2 install DESTDIR=.
       - name: Failed tests log
         if: ${{ failure() }}
-        run: cat Testing/Temporary/LastTest.log
+        run: cat build/Testing/Temporary/LastTest.log