Skip to content

Commit 54f7124

Browse files
authored
ci: fix e2e test fail when using iOS simulator 18.4 (#104)
1 parent 435d2dc commit 54f7124

File tree

3 files changed

+30
-7
lines changed

3 files changed

+30
-7
lines changed

.github/workflows/e2e.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ jobs:
2222
with:
2323
name: output-xcodeproj-file
2424
path: ./Bucketeer.xcodeproj
25+
- name: Select Xcode version
26+
run: sudo xcode-select -s '/Applications/Xcode_16.2.app/Contents/Developer'
2527

2628
- name: Download environment file
2729
uses: actions/download-artifact@v4
@@ -36,4 +38,4 @@ jobs:
3638
env:
3739
E2E_API_ENDPOINT: ${{ secrets.E2E_API_ENDPOINT }}
3840
E2E_API_KEY: ${{ secrets.E2E_API_KEY }}
39-
run: make e2e-without-building
41+
run: make e2e-without-building

.github/workflows/pull-request.yml

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,38 @@ concurrency:
1414

1515
jobs:
1616

17+
generate-xcode-project:
18+
uses: ./.github/workflows/generate-xcode-project.yml
19+
1720
lint_swift:
21+
needs: generate-xcode-project
1822
runs-on: macos-15-xlarge
1923
steps:
2024
- uses: actions/checkout@v4
2125

22-
- name: Install bootstrap mint
23-
uses: irgaly/setup-mint@99eaad2ad1197ea872390322a47620da2f21fde4 # v1.4.0
26+
# Pre-cache mint packages directory
27+
- name: Cache Mint packages
28+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
29+
with:
30+
path: |
31+
~/.mint
32+
~/Library/Caches/Mint
33+
~/Library/Developer/Xcode/DerivedData
34+
~/.swiftpm
35+
key: ${{ runner.os }}-mint-packages-${{ hashFiles('**/Mintfile') }}-v4
36+
restore-keys: |
37+
${{ runner.os }}-mint-packages-${{ hashFiles('**/Mintfile') }}-
38+
${{ runner.os }}-mint-packages-
39+
40+
# Use setup-mint action with optimized settings
41+
- name: Setup Mint
42+
uses: irgaly/setup-mint@d61b6ece0c0f5486ea8a17de6026e8da5468af60 # v1.7.0
2443
with:
2544
bootstrap: true
45+
bootstrap-link: true
2646
use-cache: true
47+
cache-prefix: "mint-setup-v4"
48+
clean: true
2749

2850
- name: Lint swift
2951
run: mint run swiftlint --strict
@@ -35,9 +57,6 @@ jobs:
3557
- name: Lint Pods
3658
run: pod lib lint --allow-warnings
3759

38-
generate-xcode-project:
39-
uses: ./.github/workflows/generate-xcode-project.yml
40-
4160
build:
4261
needs: generate-xcode-project
4362
runs-on: macos-15-xlarge

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ EXAMPLE_OPTIONS=\
1515
-project $(APP_NAME).xcodeproj \
1616
-scheme Example
1717

18-
DESTINATION=-destination "name=$(DEVICE)"
18+
DESTINATION_IPHONE=-destination "name=$(DEVICE)"
19+
# Destination for iOS Simulator, iphone 16, os 18.2
20+
DESTINATION=-destination 'id=02D18BF3-B53A-446D-A9C5-D9447E51BA48'
1921

2022
CLEAN=rm -rf build
2123
SHOW_BUILD_SETTINGS=$(XCODEBUILD) $(BUILD_SETTINGS) $(OPTIONS) $(DESTINATION) \

0 commit comments

Comments
 (0)