Skip to content

Commit d356717

Browse files
OrlaMlmarceauclarmsomdotb-moz
authored
Refactor FXIOS-10645 Update Bitrise to use XCode 16.1 (#23211)
* Update Bitrise to use XCode 16.1 * Update npm vulnrability * Add verbose to the swift command * Try edge version * Trying one thing * Update error handling in script * Remove edge version * Run script twice * Update focus * Revert npm change * Test remove shard script * Fix unit tests * Update simulator target * Change simulator * Disable some tests * Compile and test Focus on Github Actions * Use macos-15 runner * Run Focus tests for supported iOS versions * Revert to old workflow name * Update workflow name * Run Firefox smoke tests on Github Actions * Could the device matter? * Disable some more tests * Update danger version * Update package * How about iPad mini * How about using Github Actions to run old iOS versions? * Remove the update address from the smoke test --------- Co-authored-by: Laurie Marceau <lmarceau@mozilla.com> Co-authored-by: Clare So <cso@mozilla.com> Co-authored-by: mbarone <mbarone@mozilla.com>
1 parent cf5757b commit d356717

17 files changed

+156
-148
lines changed

‎.github/workflows/firefox-ios-ui-tests-previous-os.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
name: "Firefox UI Tests for iOS 15 & 16"
1+
name: "Firefox UI Tests for iOS 15, 16 & 17"
22

33
on:
44
workflow_dispatch: {}
55
env:
66
browser: firefox-ios
7-
xcode_version: 15.4
8-
ios_version: 17.5
9-
ios_simulator_default: iPhone 15
7+
xcode_version: 16.1
8+
ios_version: 18.1
9+
ios_simulator_default: iPhone 16
1010
xcodebuild_scheme: Fennec
1111
xcodebuild_target: Client
1212
test_results_directory: /Users/runner/tmp
1313

1414
jobs:
1515
compile:
1616
name: Compile
17-
runs-on: macos-14
17+
runs-on: macos-15
1818
steps:
1919
- name: Check out source code
2020
uses: actions/checkout@v4.1.7
@@ -54,13 +54,15 @@ jobs:
5454

5555
run-smoketests:
5656
name: Run smoke tests
57-
runs-on: macos-14
57+
runs-on: macos-15
5858
needs: compile
5959
strategy:
6060
fail-fast: false
6161
max-parallel: 1
6262
matrix:
6363
include:
64+
- ios_version: 17.5
65+
ios_simulator: iPhone 15
6466
- ios_version: 16.4
6567
ios_simulator: iPhone 14
6668
- ios_version: 15.5
@@ -78,8 +80,6 @@ jobs:
7880
id: xcode
7981
run: |
8082
sudo rm -rf /Applications/Xcode.app
81-
sudo rm -fr /Applications/Xcode_16*
82-
sudo rm -fr /Applications/Xcode_14*
8383
sudo xcode-select -s /Applications/Xcode_${{ env.xcode_version }}.app/Contents/Developer
8484
xcodebuild -version
8585
./checkout.sh

‎.github/workflows/firefox-ios-ui-tests.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ on:
77

88
env:
99
browser: firefox-ios
10-
xcode_version: 15.4
11-
ios_version: 17.5
12-
ios_simulator_default: iPhone 15
10+
xcode_version: 16.1
11+
ios_version: 18.1
12+
ios_simulator_default: iPhone 16
1313
xcodebuild_scheme: Fennec
1414
xcodebuild_target: Client
1515
test_results_directory: /Users/runner/tmp
1616

1717
jobs:
1818
compile:
1919
name: Compile
20-
runs-on: macos-14
20+
runs-on: macos-15
2121
steps:
2222
- name: Check out source code
2323
uses: actions/checkout@v4.1.7
@@ -63,7 +63,7 @@ jobs:
6363
fail-fast: false
6464
max-parallel: 1
6565
matrix:
66-
ios_simulator: ['iPhone 15 Plus', 'iPad Pro 13-inch (M4)']
66+
ios_simulator: ['iPhone 16', 'iPad mini (A17 Pro)']
6767
steps:
6868
- name: Check out source code
6969
uses: actions/checkout@v4.1.7

‎.github/workflows/focus-ios-ui-tests-previous-os.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
1-
name: Focus iOS 15 & 16 tests
1+
name: Focus iOS 15, 16 & 17 tests
22
on:
33
workflow_dispatch:
44
schedule:
55
- cron: "0 7 * * 1,3,5"
66

77
env:
88
browser: focus-ios
9-
xcode_version: 15.4
9+
xcode_version: 16.1
1010
test_results_directory: /Users/runner/tmp
1111

1212
jobs:
1313
Focus-iOS-Tests:
1414
name: Focus iOS
15-
runs-on: macos-14
15+
runs-on: macos-15
1616
strategy:
1717
fail-fast: false
1818
max-parallel: 1
1919
matrix:
2020
include:
21+
- ios_version: 17.5
22+
ios_simulator: iPhone 15
2123
- ios_version: 16.4
2224
ios_simulator: iPhone 14
2325
- ios_version: 15.5
@@ -38,7 +40,7 @@ jobs:
3840
id: xcode
3941
run: |
4042
sudo rm -rf /Applications/Xcode.app
41-
sudo rm -fr /Applications/Xcode_16*
43+
sudo rm -fr /Applications/Xcode_15*
4244
sudo rm -fr /Applications/Xcode_14*
4345
sudo xcode-select -s /Applications/Xcode_${{ env.xcode_version }}.app/Contents/Developer
4446
xcodebuild -version

‎.github/workflows/focus-ios-ui-tests.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ on:
77

88
env:
99
browser: focus-ios
10-
xcode_version: 15.4
11-
ios_version: 17.5
12-
ios_simulator_default: iPhone 15
10+
xcode_version: 16.1
11+
ios_version: 18.1
12+
ios_simulator_default: iPhone 16
1313
xcodebuild_scheme: Focus
1414
xcodebuild_target: XCUITest
1515
test_results_directory: /Users/runner/tmp
1616

1717
jobs:
1818
compile:
1919
name: Compile
20-
runs-on: macos-14
20+
runs-on: macos-15
2121
steps:
2222
- name: Check out source code
2323
uses: actions/checkout@v4.1.7
@@ -49,14 +49,14 @@ jobs:
4949
retention-days: 2
5050
run-tests:
5151
name: Run tests
52-
runs-on: macos-14
52+
runs-on: macos-15
5353
needs: compile
5454
strategy:
5555
fail-fast: false
5656
max-parallel: 1
5757
matrix:
5858
xcodebuild_test_plan: ['SmokeTest'] # , 'FullFunctionalTests']
59-
ios_simulator: [ 'iPhone 15', 'iPad Pro (12.9-inch) (6th generation)']
59+
ios_simulator: [ 'iPhone 16', 'iPad (10th generation)']
6060
steps:
6161
- name: Check out source code
6262
uses: actions/checkout@v4.1.7

‎BrowserKit/Tests/SiteImageViewTests/ImageProcessing/ImageHandlerTests.swift

+55-54
Original file line numberDiff line numberDiff line change
@@ -63,60 +63,61 @@ final class ImageHandlerTests: XCTestCase {
6363
XCTAssertEqual(letterImageGenerator.generateLetterImageCalled, 0)
6464
}
6565

66-
func testFavicon_whenSiteResourceNil_imageIsInBundle_noCachedImage_returnsBundleImage() async {
67-
// provide this site url, since the cache key is "google" and default favicons are store with cacheKey as name
68-
// in bundle
69-
let siteURL = URL(string: "https://www.google.com")!
70-
let subject = createSubject()
71-
let model = SiteImageModel(id: UUID(), imageType: .favicon, siteURL: siteURL)
72-
let image = await subject.fetchFavicon(imageModel: model)
73-
74-
let siteImageBundle = Bundle.allBundles.first {
75-
return $0.bundleIdentifier?.contains("SiteImageView-resources") ?? false
76-
}!
77-
let expectedImage = UIImage(named: "google", in: siteImageBundle, with: nil)
78-
XCTAssertEqual(expectedImage, image)
79-
XCTAssertEqual(siteImageCache.cacheImageCalled, 0)
80-
XCTAssertEqual(faviconFetcher.fetchImageSucceedCalled, 0)
81-
XCTAssertEqual(faviconFetcher.fetchImageFailedCalled, 0)
82-
XCTAssertEqual(letterImageGenerator.generateLetterImageCalled, 0)
83-
}
84-
85-
func testFavicon_whenSiteResourceNil_imageIsInBundle_cachedImagePresent_returnsBundleImage() async {
86-
let siteURL = URL(string: "https://www.google.com")!
87-
siteImageCache.image = UIImage()
88-
let subject = createSubject()
89-
let model = SiteImageModel(id: UUID(), imageType: .favicon, siteURL: siteURL)
90-
let image = await subject.fetchFavicon(imageModel: model)
91-
92-
let siteImageBundle = Bundle.allBundles.first {
93-
return $0.bundleIdentifier?.contains("SiteImageView-resources") ?? false
94-
}!
95-
let expectedImage = UIImage(named: "google", in: siteImageBundle, with: nil)
96-
XCTAssertEqual(expectedImage, image)
97-
XCTAssertEqual(siteImageCache.cacheImageCalled, 0)
98-
XCTAssertEqual(faviconFetcher.fetchImageSucceedCalled, 0)
99-
XCTAssertEqual(faviconFetcher.fetchImageFailedCalled, 0)
100-
XCTAssertEqual(letterImageGenerator.generateLetterImageCalled, 0)
101-
}
102-
103-
func testFavicon_whenSiteResourceIsInBundle_returnsBundleImage() async {
104-
let siteURL = URL(string: "https://www.facebook.com")!
105-
let subject = createSubject()
106-
let resource: SiteResource = .bundleAsset(name: "facebook", forRemoteResource: siteURL)
107-
let model = SiteImageModel(id: UUID(), imageType: .favicon, siteURL: siteURL, siteResource: resource)
108-
let image = await subject.fetchFavicon(imageModel: model)
109-
110-
let siteImageBundle = Bundle.allBundles.first {
111-
return $0.bundleIdentifier?.contains("SiteImageView-resources") ?? false
112-
}!
113-
let expectedImage = UIImage(named: "facebook", in: siteImageBundle, with: nil)
114-
XCTAssertEqual(expectedImage, image)
115-
XCTAssertEqual(siteImageCache.cacheImageCalled, 0)
116-
XCTAssertEqual(faviconFetcher.fetchImageSucceedCalled, 0)
117-
XCTAssertEqual(faviconFetcher.fetchImageFailedCalled, 0)
118-
XCTAssertEqual(letterImageGenerator.generateLetterImageCalled, 0)
119-
}
66+
// TODO: FXIOS-10642, loading images from the bundle this way doesn't work in XCode 16
67+
// func testFavicon_whenSiteResourceNil_imageIsInBundle_noCachedImage_returnsBundleImage() async {
68+
// // provide this site url, since the cache key is "google" and default favicons are store with cacheKey as name
69+
// // in bundle
70+
// let siteURL = URL(string: "https://www.google.com")!
71+
// let subject = createSubject()
72+
// let model = SiteImageModel(id: UUID(), imageType: .favicon, siteURL: siteURL)
73+
// let image = await subject.fetchFavicon(imageModel: model)
74+
//
75+
// let siteImageBundle = Bundle.allBundles.first {
76+
// return $0.bundleIdentifier?.contains("SiteImageView-resources") ?? false
77+
// }!
78+
// let expectedImage = UIImage(named: "google", in: siteImageBundle, with: nil)
79+
// XCTAssertEqual(expectedImage, image)
80+
// XCTAssertEqual(siteImageCache.cacheImageCalled, 0)
81+
// XCTAssertEqual(faviconFetcher.fetchImageSucceedCalled, 0)
82+
// XCTAssertEqual(faviconFetcher.fetchImageFailedCalled, 0)
83+
// XCTAssertEqual(letterImageGenerator.generateLetterImageCalled, 0)
84+
// }
85+
//
86+
// func testFavicon_whenSiteResourceNil_imageIsInBundle_cachedImagePresent_returnsBundleImage() async {
87+
// let siteURL = URL(string: "https://www.google.com")!
88+
// siteImageCache.image = UIImage()
89+
// let subject = createSubject()
90+
// let model = SiteImageModel(id: UUID(), imageType: .favicon, siteURL: siteURL)
91+
// let image = await subject.fetchFavicon(imageModel: model)
92+
//
93+
// let siteImageBundle = Bundle.allBundles.first {
94+
// return $0.bundleIdentifier?.contains("SiteImageView-resources") ?? false
95+
// }!
96+
// let expectedImage = UIImage(named: "google", in: siteImageBundle, with: nil)
97+
// XCTAssertEqual(expectedImage, image)
98+
// XCTAssertEqual(siteImageCache.cacheImageCalled, 0)
99+
// XCTAssertEqual(faviconFetcher.fetchImageSucceedCalled, 0)
100+
// XCTAssertEqual(faviconFetcher.fetchImageFailedCalled, 0)
101+
// XCTAssertEqual(letterImageGenerator.generateLetterImageCalled, 0)
102+
// }
103+
//
104+
// func testFavicon_whenSiteResourceIsInBundle_returnsBundleImage() async {
105+
// let siteURL = URL(string: "https://www.facebook.com")!
106+
// let subject = createSubject()
107+
// let resource: SiteResource = .bundleAsset(name: "facebook", forRemoteResource: siteURL)
108+
// let model = SiteImageModel(id: UUID(), imageType: .favicon, siteURL: siteURL, siteResource: resource)
109+
// let image = await subject.fetchFavicon(imageModel: model)
110+
//
111+
// let siteImageBundle = Bundle.allBundles.first {
112+
// return $0.bundleIdentifier?.contains("SiteImageView-resources") ?? false
113+
// }!
114+
// let expectedImage = UIImage(named: "facebook", in: siteImageBundle, with: nil)
115+
// XCTAssertEqual(expectedImage, image)
116+
// XCTAssertEqual(siteImageCache.cacheImageCalled, 0)
117+
// XCTAssertEqual(faviconFetcher.fetchImageSucceedCalled, 0)
118+
// XCTAssertEqual(faviconFetcher.fetchImageFailedCalled, 0)
119+
// XCTAssertEqual(letterImageGenerator.generateLetterImageCalled, 0)
120+
// }
120121

121122
func testFavicon_whenNoImages_returnsFallbackLetterFavicon_forHardcodedFaviconURL() async {
122123
let subject = createSubject()

‎Package.resolved

+15-6
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,35 @@
2323
"kind" : "remoteSourceControl",
2424
"location" : "https://github.com/nerdishbynature/octokit.swift",
2525
"state" : {
26-
"revision" : "f762f1566f7cd0e683b9329f169c28ab6ef993cc",
27-
"version" : "0.12.0"
26+
"revision" : "44192458beb89180c3a3a1245d904aacac8be0ae",
27+
"version" : "0.13.0"
2828
}
2929
},
3030
{
3131
"identity" : "requestkit",
3232
"kind" : "remoteSourceControl",
3333
"location" : "https://github.com/nerdishbynature/RequestKit.git",
3434
"state" : {
35-
"revision" : "8b0258ea2a4345cbcac90509b764faacea12efb0",
36-
"version" : "3.2.1"
35+
"revision" : "e4d905fed938807e36d87f28375f88b7c1c26840",
36+
"version" : "3.3.0"
3737
}
3838
},
3939
{
4040
"identity" : "swift",
4141
"kind" : "remoteSourceControl",
4242
"location" : "https://github.com/danger/swift.git",
4343
"state" : {
44-
"revision" : "21b074b1292286c9e90688fffa33d64d492f0520",
45-
"version" : "3.16.0"
44+
"revision" : "e43a19617fc905ef303b1af2f0449b99fc6ea0f2",
45+
"version" : "3.20.2"
46+
}
47+
},
48+
{
49+
"identity" : "swiftformat",
50+
"kind" : "remoteSourceControl",
51+
"location" : "https://github.com/nicklockwood/SwiftFormat",
52+
"state" : {
53+
"revision" : "c4d0bc2ec8aa41d4fe622771935247d74ff2e718",
54+
"version" : "0.55.1"
4655
}
4756
},
4857
{

‎Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ let package = Package(
99
.library(name: "DangerDeps", type: .dynamic, targets: ["DangerDependencies"]), // dev
1010
],
1111
dependencies: [
12-
.package(url: "https://github.com/danger/swift.git", exact: "3.16.0"), // dev
12+
.package(url: "https://github.com/danger/swift.git", exact: "3.20.2"), // dev
1313
.package(url: "https://github.com/f-meloni/danger-swift-coverage", exact: "1.2.1") // dev
1414
],
1515
targets: [

0 commit comments

Comments
 (0)