From: Mika Lindqvist <postmaster@raasu.org>
Date: Fri, 23 Feb 2024 11:21:28 +0000 (+0200)
Subject: [CI] Don't try to use macOS 11 as it's no longer supported.
X-Git-Tag: 2.2.3~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e19f15a7846e952eb251ceb8c93124d45ef4137;p=thirdparty%2Fzlib-ng.git

[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 2d2692f2..45cee60a 100644
--- 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 94214017..29668a9f 100644
--- 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