From 12696487b162da081d8db4655c4fc4bff291275c Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Fri, 2 Oct 2020 10:31:46 +0200
Subject: [PATCH] skip clang 6; define memcached path

---
 .github/workflows/cmake-build-ci.gen | 4 +++-
 .github/workflows/cmake-build-ci.yml | 7 ++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen
index 5bc59222..43e7f713 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
           ]
         ]
       ]
@@ -161,6 +161,7 @@ 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') # skip clang-6
     env:
       CMAKE_CONFIG_TYPE: Release
       OS_VND: Linux
@@ -208,6 +209,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           repository: memcached/memcached
+          path: memcached
           ref: 1.6.7
       - name: Build memcached
         run: |
diff --git a/.github/workflows/cmake-build-ci.yml b/.github/workflows/cmake-build-ci.yml
index afa528a2..58719922 100644
--- a/.github/workflows/cmake-build-ci.yml
+++ b/.github/workflows/cmake-build-ci.yml
@@ -34,6 +34,7 @@ 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') # skip clang-6
     env:
       CMAKE_CONFIG_TYPE: Release
       OS_VND: Linux
@@ -99,11 +100,6 @@ jobs:
         run: |
           echo CC=clang-8 >> ${GITHUB_ENV}
           echo CXX=clang++-8 >> ${GITHUB_ENV}
-      - name: Prepare environment (for old clang on ubuntu-18.04)
-        if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='clang') && (env.CC_VER=='old')
-        run: |
-          echo CC=clang-6.0 >> ${GITHUB_ENV}
-          echo CXX=clang++-6.0 >> ${GITHUB_ENV}
       - name: Install dependencies
         if: runner.os == 'Linux'
         run: sudo apt-get install libevent-dev libsasl2-dev ${INSTALL_MEMCACHED} ${INSTALL_CC} ${INSTALL_CXX}
@@ -192,6 +188,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           repository: memcached/memcached
+          path: memcached
           ref: 1.6.7
       - name: Build memcached
         run: |
-- 
2.30.2