Skip to content

Commit ef43694

Browse files
authored
Merge pull request #8033 from woocommerce/tooling/xcode14-refs
2 parents 4b4dfa8 + 04c81f1 commit ef43694

File tree

5 files changed

+15
-7
lines changed

5 files changed

+15
-7
lines changed

.buildkite/pipeline.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ common_params:
1111
repo: "automattic/woocommerce-ios/"
1212
# Common environment values to use with the `env` key.
1313
- &common_env
14+
# Be sure to also update the `.xcode-version` file when updating the Xcode image/version here
1415
IMAGE_ID: xcode-14
1516

1617
# This is the default pipeline – it will build and test the app

.buildkite/release-builds.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ common_params:
1313
repo: "automattic/woocommerce-ios/"
1414
# Common environment values to use with the `env` key.
1515
- &common_env
16+
# Be sure to also update the `.xcode-version` file when updating the Xcode image/version here
1617
IMAGE_ID: xcode-14
1718

1819
steps:

.xcode-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
~> 14.0

.xcversion

Lines changed: 0 additions & 1 deletion
This file was deleted.

fastlane/Fastfile

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -444,8 +444,11 @@ platform :ios do
444444
lane :build_and_upload_itc do |options|
445445
ensure_sentry_installed
446446

447-
ios_build_prechecks(skip_confirm: options[:skip_confirm], external: true) unless options[:skip_prechecks]
448-
ios_build_preflight unless options[:skip_prechecks]
447+
unless options[:skip_prechecks]
448+
ios_build_prechecks(skip_confirm: options[:skip_confirm], external: true)
449+
ios_build_preflight
450+
xcversion() # Ensure we're using the right version of Xcode, defined in `.xcode-version` file
451+
end
449452

450453
appstore_code_signing
451454

@@ -501,6 +504,7 @@ platform :ios do
501504
desc 'Builds and uploads an installable build'
502505
lane :build_and_upload_installable_build do
503506
ensure_sentry_installed
507+
xcversion() # Ensure we're using the right version of Xcode, defined in `.xcode-version` file
504508

505509
alpha_code_signing
506510

@@ -577,6 +581,8 @@ platform :ios do
577581
#####################################################################################
578582
desc 'Build for Testing'
579583
lane :build_for_testing do |options|
584+
xcversion() # Ensure we're using the right version of Xcode, defined in `.xcode-version` file
585+
580586
run_tests(
581587
workspace: 'WooCommerce.xcworkspace',
582588
scheme: TEST_SCHEME,
@@ -649,8 +655,8 @@ platform :ios do
649655
# Ensure we're using the latest Pods
650656
sh('bundle exec pod install --verbose')
651657

652-
# Ensure we're using the right version of Xcode
653-
xcversion(version: '~> 13.4')
658+
# Ensure we're using the right version of Xcode, defined in `.xcode-version` file
659+
xcversion()
654660

655661
scan(
656662
workspace: 'WooCommerce.xcworkspace',
@@ -662,8 +668,8 @@ platform :ios do
662668

663669
desc 'Take Screenshots'
664670
lane :take_screenshots do |options|
665-
# Ensure we're using the right version of Xcode
666-
xcversion(version: '~> 13.4')
671+
# Ensure we're using the right version of Xcode, defined in `.xcode-version` file
672+
xcversion()
667673

668674
# By default, clear previous screenshots
669675
languages = IOS_LOCALES

0 commit comments

Comments
 (0)