Fix CI for macOS and docker based runs. (#1308)

* Update brew install on macOS

We no longer need to specify `@8.2` to get Redis 8.x

* Two small CI fixes

* Rework how we detect the redis-server version depending on whether the
  test will use the system server or one from docker.
* Make failing to delete our created temp directory non-fatal. This can
  fail on GitHub CI due to uid mismatches between docker and the host
  runner.

Author: michael-grunder

.github/workflows/build.yml

@@ -97,8 +97,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          brew install openssl redis@8.0
-          brew link redis@8.0 --force
+          brew install openssl redis
+          brew link redis --force
 
       - name: Build hiredis
         run: USE_SSL=1 make
@@ -158,10 +158,10 @@ jobs:
         with:
           cmake-version: ${{ matrix.cmake-version }}
       - name: Install hiredis dependencies
-        run: |          
+        run: |
           sudo apt-get install -y libssl-dev libevent-dev
       - name: Build
         run: |
           mkdir build && cd build
           cmake -DENABLE_SSL=ON -DENABLE_SSL_TESTS=ON -DENABLE_ASYNC_TESTS=ON -DENABLE_EXAMPLES=ON ..
-          make
+          make

test.sh

@@ -11,7 +11,14 @@ SKIPS_ARG=${SKIPS_ARG:-}
 REDIS_DOCKER=${REDIS_DOCKER:-}
 
 # We need to enable the DEBUG command for redis-server >= 7.0.0
-REDIS_MAJOR_VERSION="$(${REDIS_SERVER} --version|awk -F'[^0-9]+' '{ print $2 }')"
+if [ -n "${REDIS_DOCKER}" ]; then
+    REDIS_VERSION="$(docker run --rm ${REDIS_DOCKER} ${REDIS_SERVER} --version)"
+else
+    REDIS_VERSION="$(${REDIS_SERVER} --version)"
+fi
+
+# Enable debug command for redis >= 7.0.0
+REDIS_MAJOR_VERSION="$(echo ${REDIS_VERSION} | awk -F'[^0-9]+' '{ print $2 }')"
 if [ "$REDIS_MAJOR_VERSION" -gt "6" ]; then
     ENABLE_DEBUG_CMD="enable-debug-command local"
 fi
@@ -57,7 +64,11 @@ cleanup() {
     set +e
     kill $(cat ${PID_FILE})
   fi
-  rm -rf ${tmpdir}
+
+  # Make failure to remove the temp dir non-fatal
+  rm -rf -- "${tmpdir}" 2>/dev/null || {
+    echo "warning: failed to remove temp dir: ${tmpdir}" >&2
+  }
 }
 trap cleanup INT TERM EXIT