From 07b607fbff435d2be8375e23855eb0fb25d4e8d9 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Fri, 2 Oct 2020 12:11:43 +0200
Subject: [PATCH] gh-actions

---
 .github/workflows/cmake-build-ci.gen | 1 -
 .github/workflows/cmake-build-ci.yml | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

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
-- 
2.30.2