Skip to content

Commit

Permalink
Merge topic 'ci-xcode-16.2' into release-3.31
Browse files Browse the repository at this point in the history
86ee7cb ci: update macOS jobs to use Xcode 16.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10107
  • Loading branch information
bradking authored and kwrobot committed Dec 18, 2024
2 parents 51457c1 + 86ee7cb commit 01bfaf6
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions .gitlab/os-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci ext/$CI_CONCURRENT_ID"
# TODO: Factor this out so that each job selects the Xcode version to
# use so that different versions can be tested in a single pipeline.
DEVELOPER_DIR: "/Applications/Xcode-16.1.app/Contents/Developer"
DEVELOPER_DIR: "/Applications/Xcode-16.2.app/Contents/Developer"
# Avoid conflicting with other projects running on the same machine.
SCCACHE_SERVER_PORT: 4227

Expand Down Expand Up @@ -142,39 +142,39 @@
- cmake # Since this is a bare runner, pin to a project.
- macos-x86_64
- shell
- xcode-16.1
- xcode-16.2
- nonconcurrent

.macos_x86_64_tags_ext:
tags:
- cmake # Since this is a bare runner, pin to a project.
- macos-x86_64
- shell
- xcode-16.1
- xcode-16.2
- concurrent

.macos_arm64_tags:
tags:
- cmake # Since this is a bare runner, pin to a project.
- macos-arm64
- shell
- xcode-16.1
- xcode-16.2
- nonconcurrent

.macos_arm64_tags_ext:
tags:
- cmake # Since this is a bare runner, pin to a project.
- macos-arm64
- shell
- xcode-16.1
- xcode-16.2
- concurrent

.macos_arm64_tags_package:
tags:
- cmake # Since this is a bare runner, pin to a project.
- macos-arm64
- shell
- xcode-16.1
- xcode-16.2
- nonconcurrent
- finder

Expand Down

0 comments on commit 01bfaf6

Please sign in to comment.