chore: 🤖 fix default apple macosx and xcode vars

LottieFiles · Jun 13, 2024 · 66e886d · 66e886d
1 parent 1eda616
commit 66e886d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -40,7 +40,8 @@ jobs:
       - name: Build Android
         if: github.event.inputs.target == 'android' || github.event.inputs.target == 'all'
         env:
-          APPLE_MACOSX_SDK: MacOSX13
+          APPLE_XCODE_APP_NAME: Xcode_13.3.1.app
+          APPLE_MACOSX_SDK: MacOSX12.3
         run: make android
 
       - name: Upload Android Artifacts
@@ -52,7 +53,8 @@ jobs:
       - name: Build Apple
         if: github.event.inputs.target == 'apple' || github.event.inputs.target == 'all'
         env:
-          APPLE_MACOSX_SDK: MacOSX13
+          APPLE_XCODE_APP_NAME: Xcode_13.3.1.app
+          APPLE_MACOSX_SDK: MacOSX12.3
         run: rm -f /usr/local/lib/libjpeg* ; make apple
 
       - name: Upload Apple Artifacts
@@ -64,7 +66,8 @@ jobs:
       - name: Build WASM
         if: github.event.inputs.target == 'wasm' || github.event.inputs.target == 'all'
         env:
-          APPLE_MACOSX_SDK: MacOSX13
+          APPLE_XCODE_APP_NAME: Xcode_13.3.1.app
+          APPLE_MACOSX_SDK: MacOSX12.3
         run: make wasm
 
       - name: Upload WASM Artifacts

diff --git a/.github/workflows/check-pr.yaml b/.github/workflows/check-pr.yaml
@@ -25,12 +25,13 @@ jobs:
         run: make mac-setup
       - name: Build Artifacts
         env:
-          APPLE_MACOSX_SDK: MacOSX13
-        run: make demo-player
+          APPLE_XCODE_APP_NAME: Xcode_13.3.1.app
+          APPLE_MACOSX_SDK: MacOSX12.3
+        run: make all
       - name: Run Tests
         run: make test
       - name: Run Clippy
         run: make clippy
         # Make sure CI fails on all warnings, including Clippy lints
         env:
-          RUSTFLAGS: "-Dwarnings"
+          RUSTFLAGS: "-Dwarnings"
diff --git a/Makefile b/Makefile
@@ -68,15 +68,15 @@ APPLE_IOS := ios
 APPLE_IOS_PLATFORM := iPhoneOS
 APPLE_IOS_SDK ?= iPhoneOS
 APPLE_IOS_VERSION_MIN ?= 15.4
-APPLE_XCODE_APP_NAME ?= Xcode_13.3.1.app
+APPLE_XCODE_APP_NAME ?= Xcode.app
 
 APPLE_IOS_SIMULATOR := ios-simulator
 APPLE_IOS_SIMULATOR_PLATFORM := iPhoneSimulator
 APPLE_IOS_SIMULATOR_SDK ?= iPhoneSimulator
 
 APPLE_MACOSX := macosx
 APPLE_MACOSX_PLATFORM := MacOSX
-APPLE_MACOSX_SDK ?= MacOSX12.3
+APPLE_MACOSX_SDK ?= MacOSX
 
 APPLE_IOS_FRAMEWORK_TYPE := $(APPLE_IOS)
 APPLE_IOS_SIMULATOR_FRAMEWORK_TYPE := $(APPLE_IOS_SIMULATOR)