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

gh-actions
---

diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen
index 3598db19..3a914d32 100755
--- a/.github/workflows/cmake-build-ci.gen
+++ b/.github/workflows/cmake-build-ci.gen
@@ -161,7 +161,6 @@ jobs:
         compiler_vendor: [gnu, clang]
         compiler_version: [new, cur, old]
     runs-on: ${{ matrix.os }}
-    if: ${{ matrix.os }}  != 'ubuntu-18.04' || ${{ matrix.compiler_vendor }} != 'clang' || ${{ matrix.compiler_version }} != 'old'
     env:
       CMAKE_CONFIG_TYPE: Release
       OS_VND: Linux
diff --git a/.github/workflows/cmake-build-ci.yml b/.github/workflows/cmake-build-ci.yml
index f137b55d..e07723b2 100644
--- a/.github/workflows/cmake-build-ci.yml
+++ b/.github/workflows/cmake-build-ci.yml
@@ -34,7 +34,10 @@ jobs:
         compiler_vendor: [gnu, clang]
         compiler_version: [new, cur, old]
     runs-on: ${{ matrix.os }}
+<<<<<<< HEAD
     if: matrix.os != 'ubuntu-18.04' || matrix.compiler_vendor != 'clang' || matrix.compiler_version != 'old'
+=======
+>>>>>>> 60a29acb... gh-actions
     env:
       CMAKE_CONFIG_TYPE: Release
       OS_VND: Linux