From: Joel Rosdahl <joel@rosdahl.net>
Date: Fri, 22 Jul 2022 11:08:21 +0000 (+0200)
Subject: ci: Bump to macOS 11
X-Git-Tag: v4.7~141
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df9d855ec68c5f5d2200fd7636acd116e7489300;p=thirdparty%2Fccache.git

ci: Bump to macOS 11

The macOS 10.15 runners are being deprecated.
---

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f54424b1b..fe1e01a48 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -66,11 +66,11 @@ jobs:
             compiler: gcc
             version: "11"
 
-          - os: macOS-10.15
+          - os: macOS-11
             compiler: xcode
             version: "11.7"
 
-          - os: macOS-10.15
+          - os: macOS-11
             compiler: xcode
             version: "12.4"
     steps:
diff --git a/test/suites/secondary_redis_unix.bash b/test/suites/secondary_redis_unix.bash
index 3e59853a7..9a6bfa834 100644
--- a/test/suites/secondary_redis_unix.bash
+++ b/test/suites/secondary_redis_unix.bash
@@ -7,7 +7,7 @@ SUITE_secondary_redis_unix_PROBE() {
         echo "redis-server not found"
         return
     fi
-    if redis-server --unixsocket /foo/redis.sock |& grep -q "FATAL CONFIG FILE ERROR"; then
+    if redis-server --unixsocket /foo/redis.sock 2>&1 | grep -q "FATAL CONFIG FILE ERROR"; then
         # "Bad directive or wrong number of arguments"
         echo "redis-server without unixsocket"
         return