fixup! fixup! ci: Try to fix macOS runner

rust-lang · Apr 26, 2024 · cb775dd · cb775dd
1 parent ccc9183
commit cb775dd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/bindgen.yml b/.github/workflows/bindgen.yml
@@ -179,7 +179,7 @@ jobs:
 
           # Ensure stuff works on macos too
           - os: macos-latest
-            llvm_version: "16.0"
+            llvm_version: "17.0"
             release_build: 0
             no_default_features: 0
             feature_extra_asserts: 0

diff --git a/ci/test.sh b/ci/test.sh
@@ -24,9 +24,10 @@ function llvm_macos_target_triple() {
 
 function llvm_version_triple() {
   case "$1" in
-    9.0) echo "9.0.1" ;;
+    9.0)  echo "9.0.1" ;;
+    17.0) echo "17.0.6" ;;
     # By default, take the .0 patch release
-    *)   echo "$1.0"  ;;
+    *)    echo "$1.0"  ;;
   esac
 }
 
@@ -66,6 +67,7 @@ set_llvm_env() {
     llvm_download $base_url `llvm_macos_target_triple ${LLVM_VERSION_TRIPLE}`
     export DYLD_LIBRARY_PATH="${LLVM_DIRECTORY}/lib":${DYLD_LIBRARY_PATH:-}
     export CARGO_TARGET_AARCH64_APPLE_DARWIN_LINKER="${LLVM_DIRECTORY}/bin/clang"
+    export MACOSX_DEPLOYMENT_TARGET="14.0"
   fi
   export LD="${LLVM_DIRECTORY}/bin/clang"
   export CC="${LLVM_DIRECTORY}/bin/clang"