ci

parse-community · Jan 27, 2025 · e953477 · e953477
1 parent 40c9f40
commit e953477
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -115,20 +115,24 @@ jobs:
             developerDir: CI_XCODE_16
           - name: iOS 17, iPhone 15
             script: test:ios
-            osVersion: '17.5'
-            deviceModel: 'iPhone 15'
+            iosVersion: '17.5'
+            deviceModel: iPhone 15
             developerDir: CI_XCODE_16
           - name: iOS 18, iPhone 16
             script: test:ios
-            osVersion: '18.1'
-            deviceModel: 'iPhone 16'
+            iosVersion: '18.1'
+            deviceModel: iPhone 16
             developerDir: CI_XCODE_16
           - name: macOS 14
             script: test:macos
-            osVersion: 14
+            macosVersion: 14
+            developerDir: CI_XCODE_16
+          - name: macOS 15
+            script: test:macos
+            macosVersion: 15
             developerDir: CI_XCODE_16
       fail-fast: false
-    runs-on: macos-14
+    runs-on: macos-${{ matrix.macosVersion || 14 }}
     name: ${{ matrix.name }}
     steps:
       - uses: actions/checkout@v4
@@ -152,7 +156,7 @@ jobs:
       - name: Submodules
         run: git submodule update --init --recursive
       - name: Build-Test
-        run: set -o pipefail && env NSUnbufferedIO=YES OS_VERSION="${{ matrix.osVersion }}" DEVICE_MODEL="${{ matrix.deviceModel }}" bundle exec rake ${{ matrix.script }}
+        run: set -o pipefail && env NSUnbufferedIO=YES IOS_VERSION="${{ matrix.iosVersion }}" DEVICE_MODEL="${{ matrix.deviceModel }}" bundle exec rake ${{ matrix.script }}
         env:
           DEVELOPER_DIR: ${{ env[matrix.developerDir] }}
       - name: Generate Environment Variables

diff --git a/Rakefile b/Rakefile
@@ -12,10 +12,7 @@ require_relative 'Vendor/xctoolchain/Scripts/xctask/build_task'
 SCRIPT_PATH = File.expand_path(File.dirname(__FILE__))
 starters_path = File.join(SCRIPT_PATH, 'ParseStarterProject')
 
-puts "Device model: #{ENV['DEVICE_MODEL']}"
-puts "OS version: #{ENV['OS_VERSION']}"
-
-ios_simulator = "platform=\"iOS Simulator\",name=\"#{ENV['DEVICE_MODEL'] || 'iPhone 16'}\",OS=\"#{ENV['OS_VERSION'] || '17.0'}\""
+ios_simulator = "platform=\"iOS Simulator\",name=\"#{ENV['DEVICE_MODEL'] || 'iPhone 16'}\",OS=\"#{ENV['IOS_VERSION'] || '17.0'}\""
 tvos_simulator = 'platform="tvOS Simulator",name="Apple TV"'
 watchos_simulator = 'platform="watchOS Simulator",name="Apple Watch Series 10 (46mm)"'