[CI] Don't try to use macOS 11 as it's no longer supported.

diff --git a/.github/workflows/pkgcheck.yml b/.github/workflows/pkgcheck.yml
index 2d2692f2dbb4fea8558b04defb99be97f3899334..45cee60a5767f794e12e50df3162346ea861d661 100644 (file)
--- a/.github/workflows/pkgcheck.yml
+++ b/.github/workflows/pkgcheck.yml
@@ -75,12 +75,12 @@ jobs:
             packages: qemu gcc-powerpc64le-linux-gnu g++-powerpc64le-linux-gnu libc6-dev-ppc64el-cross
 
           - name: macOS Clang
-            os: macOS-11
+            os: macOS-latest
             compiler: clang
             cxx-compiler: clang++
 
           - name: macOS Clang Symbol Prefix
-            os: macOS-11
+            os: macOS-latest
             compiler: clang
             cxx-compiler: clang++
             cmake-args: -DZLIB_SYMBOL_PREFIX=zTest_
@@ -116,13 +116,10 @@ jobs:
         HOMEBREW_NO_INSTALL_CLEANUP: 1
 
     - name: Select Xcode version (macOS)
-      # Use a version of Xcode that supports ZERO_AR_DATE until CMake supports
-      # AppleClang linking with libtool using -D argument
-      # https://gitlab.kitware.com/cmake/cmake/-/issues/19852
       if: runner.os == 'macOS'
       uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: '11.7.0'
+        xcode-version: '15.2'
 
     - name: Compare builds
       run: sh test/pkgcheck.sh

diff --git a/test/pkgcheck.sh b/test/pkgcheck.sh
index 942140179ebf3c71189ab40f4fc93bd2fb46f903..29668a9f4f52b84c518ac7ccb9aa7e768dad215c 100644 (file)
--- a/test/pkgcheck.sh
+++ b/test/pkgcheck.sh
@@ -79,8 +79,11 @@ Darwin)
   # What CPU are we running on, exactly?
   sysctl -n machdep.cpu.brand_string
   sysctl -n machdep.cpu.features
-  sysctl -n machdep.cpu.leaf7_features
-  sysctl -n machdep.cpu.extfeatures
+  if test "$(uname -m)" = "x86_64"
+  then
+    sysctl -n machdep.cpu.leaf7_features
+    sysctl -n machdep.cpu.extfeatures
+  fi
   ;;
 esac