Skip to content

Commit e6fadfd

Browse files
Move source of truth for Xcode version to shared-pipeline-vars
1 parent 3d30eeb commit e6fadfd

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

.buildkite/pipeline.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
agents:
77
queue: "mac"
88
env:
9-
IMAGE_ID: $IMAGE_ID
9+
IMAGE_ID: $CURRENT_IMAGE_ID
1010

1111
steps:
1212
#################
@@ -32,7 +32,7 @@ steps:
3232
IMAGE_ID: "{{matrix.image_id}}"
3333
matrix:
3434
setup: # Specify the current version of Xcode, Swift, a device, and the required version of iOS
35-
image_id: $IMAGE_ID
35+
image_id: $CURRENT_IMAGE_ID
3636
swift_version: "5.10"
3737
device_model: "default"
3838
device_os: "default"
@@ -62,7 +62,7 @@ steps:
6262
IMAGE_ID: "{{matrix.image_id}}"
6363
matrix:
6464
setup: # Specify the current version of Xcode and Swift
65-
image_id: $IMAGE_ID
65+
image_id: $CURRENT_IMAGE_ID
6666
swift_version: "5.10"
6767
adjustments: # Specify additional versions of Xcode and Swift
6868
- with:

.buildkite/shared-pipeline-vars

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
# This file is `source`'d before calling `buildkite-agent pipeline upload`, and can be used
44
# to set up some variables that will be interpolated in the `.yml` pipeline before uploading it.
55

6-
export IMAGE_ID=$(echo "xcode-$(cat .xcode-version)")
6+
export CURRENT_IMAGE_ID="15.4"
77

88
export CI_TOOLKIT="automattic/a8c-ci-toolkit#3.2.2"

.xcode-version

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

0 commit comments

Comments
 (0)