Skip to content

Commit 4a225d7

Browse files
authored
ci: try to use macos-15 for iOS 26 e2e tests (#1393)
## 📜 Description Use `macos-15` instead of `macos-26`. ## 💡 Motivation and Context Looks like `macos-26` + iOS 26 are not stable yet at the moment: actions/runner-images#13830 So in this PR I'm switching to `macos-15` instead. Also reverting #1382 as it looks like it doesn't improve situation at all. ## 📢 Changelog <!-- High level overview of important changes --> <!-- For example: fixed status bar manipulation; added new types declarations; --> <!-- If your changes don't affect one of platform/language below - then remove this platform/language --> ### CI - removed changes introduced in #1382 - switch to `macos-15` instead of `macos-26`; ## 🤔 How Has This Been Tested? Tested via this PR (2x run). ## 📸 Screenshots (if appropriate): <img width="664" height="176" alt="image" src="https://github.com/user-attachments/assets/9d49733a-320e-41d4-8e21-105b58623c5b" /> ## 📝 Checklist - [x] CI successfully passed - [x] I added new mocks and corresponding unit-tests if library API was changed
1 parent 838154f commit 4a225d7

1 file changed

Lines changed: 2 additions & 21 deletions

File tree

.github/workflows/ios-e2e-test.yml

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ jobs:
114114
run: |
115115
if [[ "${{ github.event_name }}" == "pull_request" ]]; then
116116
# Subset for PRs: Only ios 15, 26, 26e (adjust as needed)
117-
echo 'matrix={"devices": [{"ios": 15, artifact: "16.4", "xcode": "16.4", "macos": 15, "runtime": "15.5", "iphone": "iPhone 13 Pro", "os": "15.5"}, {"ios": 17, artifact: "16.4", "xcode": "16.4", "macos": 15, "runtime": "17.5", "iphone": "iPhone 15 Pro", "os": "17.5"}, {"ios": "26e", artifact: "26.1", "xcode": "26.1", "macos": 26, "iphone": "iPhone 16e", "os": "26.1"}]}' >> $GITHUB_OUTPUT
117+
echo 'matrix={"devices": [{"ios": 15, artifact: "16.4", "xcode": "16.4", "macos": 15, "runtime": "15.5", "iphone": "iPhone 13 Pro", "os": "15.5"}, {"ios": 17, artifact: "16.4", "xcode": "16.4", "macos": 15, "runtime": "17.5", "iphone": "iPhone 15 Pro", "os": "17.5"}, {"ios": "26e", artifact: "26.1", "xcode": "26.1", "macos": 15, "iphone": "iPhone 16e", "os": "26.1"}]}' >> $GITHUB_OUTPUT
118118
else
119119
# Full set for main
120-
echo 'matrix={"devices": [{"ios": 15, artifact: "16.4", "xcode": "16.4", "macos": 15, "runtime": "15.5", "iphone": "iPhone 13 Pro", "os": "15.5"}, {"ios": 16, artifact: "16.4", "xcode": "16.4", "macos": 15, "runtime": "16.4", "iphone": "iPhone 14 Pro", "os": "16.4"}, {"ios": 17, artifact: "16.4", "xcode": "16.4", "macos": 15, "runtime": "17.5", "iphone": "iPhone 15 Pro", "os": "17.5"}, {"ios": 18, artifact: "16.4", "xcode": "16.4", "macos": 15, "iphone": "iPhone 16 Pro", "os": "18.5"}, {"ios": 26, artifact: "16.4", "xcode": "26.0", "macos": 26, "iphone": "iPhone 17 Pro", "os": "26.2"}, {"ios": "26e", artifact: "26.1", "xcode": "26.1", "macos": 26, "iphone": "iPhone 16e", "os": "26.1"}]}' >> $GITHUB_OUTPUT
120+
echo 'matrix={"devices": [{"ios": 15, artifact: "16.4", "xcode": "16.4", "macos": 15, "runtime": "15.5", "iphone": "iPhone 13 Pro", "os": "15.5"}, {"ios": 16, artifact: "16.4", "xcode": "16.4", "macos": 15, "runtime": "16.4", "iphone": "iPhone 14 Pro", "os": "16.4"}, {"ios": 17, artifact: "16.4", "xcode": "16.4", "macos": 15, "runtime": "17.5", "iphone": "iPhone 15 Pro", "os": "17.5"}, {"ios": 18, artifact: "16.4", "xcode": "16.4", "macos": 15, "iphone": "iPhone 16 Pro", "os": "18.5"}, {"ios": 26, artifact: "16.4", "xcode": "26.0", "macos": 15, "iphone": "iPhone 17 Pro", "os": "26.2"}, {"ios": "26e", artifact: "26.1", "xcode": "26.1", "macos": 15, "iphone": "iPhone 16e", "os": "26.1"}]}' >> $GITHUB_OUTPUT
121121
fi
122122
e2e-test:
123123
name: ⚙️ Automated test cases (iOS-${{ matrix.devices.ios }}, XCode-${{ matrix.devices.artifact }})
@@ -138,25 +138,6 @@ jobs:
138138
- uses: maxim-lobanov/setup-xcode@v1
139139
with:
140140
xcode-version: ${{ matrix.devices.xcode }}
141-
- name: Cleanup iOS simulator
142-
run: |
143-
echo "Before:"
144-
df -h
145-
146-
# Kill simulator services
147-
sudo killall -9 com.apple.CoreSimulator.CoreSimulatorService || true
148-
149-
# Unmount all runtime volumes
150-
mount | grep CoreSimulator | awk '{print $1}' | while read disk; do
151-
sudo diskutil unmount force "$disk" || true
152-
done
153-
154-
# Clean everything
155-
rm -rf ~/Library/Developer/CoreSimulator || true
156-
rm -rf ~/Library/Developer/Xcode/DerivedData || true
157-
158-
echo "After cleanup:"
159-
df -h
160141
- name: Get Xcode version
161142
run: xcodebuild -version
162143
# needed for additional runtime installation

0 commit comments

Comments
 (0)