Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci(fix): fix nightly, upgrade xcode to 16 #11181

Merged
merged 17 commits into from
Nov 25, 2024
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ jobs:
BUNDLE_PATH: .vendor

macos:
xcode: 15.1
xcode: 16.1
resource_class: macos.m1.medium.gen1

steps:
Expand All @@ -206,7 +206,7 @@ jobs:
BUNDLE_PATH: .vendor

macos:
xcode: 15.1
xcode: 16.1
resource_class: macos.m1.medium.gen1

steps:
Expand All @@ -227,7 +227,7 @@ jobs:
BUNDLE_PATH: .vendor

macos:
xcode: 15.1
xcode: 16.1
resource_class: macos.m1.medium.gen1

steps:
Expand Down Expand Up @@ -322,7 +322,7 @@ jobs:
BUNDLE_PATH: .vendor # path to install gems and use for caching

macos:
xcode: 15.1
xcode: 16.1
resource_class: macos.m1.medium.gen1

steps:
Expand Down Expand Up @@ -406,7 +406,7 @@ jobs:
BUNDLE_PATH: .vendor # path to install gems and use for caching

macos:
xcode: 15.1
xcode: 16.1
resource_class: macos.m1.medium.gen1

steps:
Expand Down Expand Up @@ -447,9 +447,9 @@ jobs:
- install-gems
- install-cocoapods
- macos/preboot-simulator:
version: "17.2"
version: "18.1"
platform: "iOS"
device: "iPhone 15 Pro"
device: "iPhone 16 Pro"
- build-app-ios
- macos/install-rosetta
- run:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.4
3.1.6
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nodejs 20.9.0
ruby 3.1.4
ruby 3.1.6
java zulu-17.50.19
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed ...ntedVIRViewControllerSpec/[email protected]
Binary file not shown.
Copy link
Contributor Author

@brainbicycle brainbicycle Nov 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these screenshots for View in Room seem kind of useless / not showing what the test expects, not sure if they were before my update, maybe should get rid of or check if I broke something

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed ...tedVIRViewControllerSpec/[email protected]
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed ...es/ARBidButtonSpec/[email protected]
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Diff not rendered.
Binary file removed ...onViewControllerSpec/[email protected]
Diff not rendered.
Binary file modified ...onInformationViewControllerTests/[email protected]
Binary file modified ...eAuctionBidButtonTests/[email protected]
Binary file modified ...ReferenceImages/LiveAuctionBidButtonTests/[email protected]
Binary file modified .../ReferenceImages/LiveAuctionBidButtonTests/[email protected]
Binary file modified ...erenceImages/LiveAuctionBidButtonTests/[email protected]
Binary file modified ...eImages/LiveAuctionBidButtonTests/[email protected]
Binary file modified ...Images/LiveAuctionBidButtonTests/[email protected]
Binary file modified ...mages/LiveAuctionBidButtonTests/[email protected]
Binary file modified ...tionBidButtonTests/[email protected]
Binary file modified ...tStickyCellCollectionViewLayoutTests/[email protected]
Binary file modified ...ListStickyCellCollectionViewLayoutTests/[email protected]
Binary file modified ...eferenceImages/SaleOnHoldOverlayViewTests/[email protected]
Binary file modified ...erenceImages/SaleOnHoldOverlayViewTests/[email protected]
Binary file modified ...ges/SaleOnHoldOverlayViewTests/[email protected]
Binary file modified ...s/SaleOnHoldOverlayViewTests/[email protected]
8 changes: 4 additions & 4 deletions ios/ArtsyTests/Supporting_Files/ARTestHelper.m
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ - (BOOL)application:(UIApplication *)application willFinishLaunchingWithOptions:
{
NSOperatingSystemVersion version = [NSProcessInfo processInfo].operatingSystemVersion;

NSAssert(version.majorVersion == 17 && version.minorVersion == 2,
@"The tests should be run on iOS 17.2, not %ld.%ld", version.majorVersion, version.minorVersion);
NSAssert(version.majorVersion == 18 && version.minorVersion == 1,
@"The tests should be run on iOS 18.1, not %ld.%ld", version.majorVersion, version.minorVersion);

CGSize nativeResolution = [UIScreen mainScreen].nativeBounds.size;
NSAssert([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPhone && CGSizeEqualToSize(nativeResolution, CGSizeMake(1179, 2556)),
@"The tests should be run on an iPhone 15 Pro, not a device with native resolution %@",
NSAssert([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPhone && CGSizeEqualToSize(nativeResolution, CGSizeMake(1206, 2622)),
@"The tests should be run on an iPhone 16 Pro, not a device with native resolution %@",
NSStringFromCGSize(nativeResolution));

ARPerformWorkAsynchronously = NO;
Expand Down
2 changes: 1 addition & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ target 'Artsy' do
# Swift pods 🎉
pod 'Quick', '2.0.0'
pod 'Nimble', '~> 13.0'
pod 'Nimble-Snapshots', '9.7.0'
pod 'Nimble-Snapshots', '9.8.0'
end

post_install do |installer|
Expand Down
12 changes: 6 additions & 6 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -240,9 +240,9 @@ PODS:
- nanopb/encode (2.30910.0)
- Nimble (13.2.1):
- CwlPreconditionTesting (~> 2.2.0)
- Nimble-Snapshots (9.7.0):
- Nimble-Snapshots/Core (= 9.7.0)
- Nimble-Snapshots/Core (9.7.0):
- Nimble-Snapshots (9.8.0):
- Nimble-Snapshots/Core (= 9.8.0)
- Nimble-Snapshots/Core (9.8.0):
- iOSSnapshotTestCase (~> 8.0)
- Nimble (~> 13.0)
- ObjectiveSugar (1.1.0)
Expand Down Expand Up @@ -2200,7 +2200,7 @@ DEPENDENCIES:
- MultiDelegate
- nanopb
- Nimble (~> 13.0)
- Nimble-Snapshots (= 9.7.0)
- Nimble-Snapshots (= 9.8.0)
- ObjectiveSugar
- OCMock
- OHHTTPStubs (= 3.1.2)
Expand Down Expand Up @@ -2721,7 +2721,7 @@ SPEC CHECKSUMS:
MultiDelegate: 228e2321b74f45ea43ae19c268fdd60fd88d99b7
nanopb: 438bc412db1928dac798aa6fd75726007be04262
Nimble: 9e81a67096dab1d1f5160d7a3f8fa7a1eeec38fd
Nimble-Snapshots: 7f2710c507469eb0fc4912f45d0f280e15f91966
Nimble-Snapshots: 240ea76ee8e52dfc1387b8d0d9bf1db3420cabbd
ObjectiveSugar: a6a25f23d657c19df0a0b972466d5b5ca9f5295c
OCMock: 9491e4bec59e0b267d52a9184ff5605995e74be8
OHHTTPStubs: c93230597bc5c8b74bcfdb403cc8773515b8b08c
Expand Down Expand Up @@ -2851,6 +2851,6 @@ SPEC CHECKSUMS:
"XCTest+OHHTTPStubSuiteCleanUp": 4469ec8863c6bc022c5089a9b94233eb3416c5ee
Yoga: 055f92ad73f8c8600a93f0e25ac0b2344c3b07e6

PODFILE CHECKSUM: 46318adcb474038e55e674055ad6287fc96886af
PODFILE CHECKSUM: 1ad2c11c9fcf27a0ecd1b21668bca159cfeb9ed8

COCOAPODS: 1.14.3
4 changes: 2 additions & 2 deletions scripts/ci/ci-setup-export-vars
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export LOCAL_BRANCH
export WORKSPACE="ios/Artsy.xcworkspace"
export SCHEME="Artsy"
export DEVICE_HOST_PLAT="iOS Simulator"
export DEVICE_HOST_OS="17.2"
export DEVICE_HOST_NAME="iPhone 15 Pro"
export DEVICE_HOST_OS="18.1"
export DEVICE_HOST_NAME="iPhone 16 Pro"
export DERIVED_DATA_PATH="derived_data"
export CONFIGURATION="Release"
6 changes: 3 additions & 3 deletions scripts/utils/doctor.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ const fs = require("fs")
const chalk = require("chalk")

const desiredVersions = {
xcode: "15.0",
xcode: "16.1",
androidStudio: "2022.3",
ruby: "3.1.4",
ruby: "3.1.6",
bundler: "2.4.3",
}

Expand Down Expand Up @@ -161,7 +161,7 @@ const checkPodDependenciesAreUpToDate = async () => {
// https://github.com/square/cocoapods-check/issues/18
// This is a bug for some react native deps in cocoapods-check
// might be a nice OSS contribution opportunity!
const knownException = `~RNImageCropPicker, ~RNPermissions, ~React-Codegen\n[!] \`pod install\` will install 3 Pods.`
const knownException = `~RNFastImage, ~RNImageCropPicker, ~RNPermissions, ~RNShare, ~React-RCTFabric, ~ReactCodegen, ~react-native-blob-util, ~react-native-view-shot\n[!] \`pod install\` will install 8 Pods.`
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

little bonus fix issue with yarn doctor causing it always to report pods not installed


// pod check will return status 1 even for only warnings
if (status !== 0) {
Expand Down