gh-actions

diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen
index 3598db19fa91179dc0d3d63ed51691f76db73a76..3a914d32b0cf3b279c6eab7c62c7fb17c7c98398 100755 (executable)
--- 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 f137b55de954a62fad62a6604ff6ec099bfcf722..e07723b2a4f4833bab6e201a4dc36031d56a44f5 100644 (file)
--- 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