diff options
| author | Gerald Combs <gerald@wireshark.org> | 2023-11-30 18:55:53 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2023-12-01 09:29:30 -0800 |
| commit | f93fa9d8966af913a37c9862cb0a5a276ce3b05a (patch) | |
| tree | ebc1268e52ac7d61e5db4e7e8813e8f2e2179223 /.gitlab-ci.yml | |
| parent | e5e6e67965049c16f70c1129269c93477acb61dc (diff) | |
GitLab CI: Use the default / stable macOS image
According to
https://docs.gitlab.com/ee/ci/runners/saas/macos_saas_runner.html
if we don't specify an image we'll run the current stable / Generally
Available image, which is currently macos-13-xcode-14. Using the current
GA image should increase our chances of staying within Homebrew's
support window.
Add a workaround for asdf in the macos-13-xcode-14. Hopefully it won't
require further babysitting.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed61677d6b..5a759e7c31 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -198,8 +198,7 @@ variables: # https://gitlab.com/gitlab-org/ci-cd/shared-runners/images/macstadium/orka/-/blob/main/toolchain/monterey.yml .build-macos: stage: build - tags: [ saas-macos-medium-m1 ] - image: macos-12-xcode-14 # https://docs.gitlab.com/ee/ci/runners/saas/macos/environment.html + tags: [ saas-macos-medium-m1 ] # https://docs.gitlab.com/ee/ci/runners/saas/macos/environment.html retry: 1 # https://gould.cx/ted/blog/2017/06/10/ccache-for-Gitlab-CI/ cache: @@ -221,8 +220,8 @@ variables: # The suite_clopts.case_tshark_extcap.test_tshark_extcap_interfaces test will fail because # it sets an alternate HOME, which results in asdf returning # unknown command: python3. Perhaps you have to reshim? - # Make sure /usr/local/bin is first in order to work around asdf. - - export PATH=/usr/local/bin:$PATH + # Make sure directories that might contain Python are first in order to work around asdf. + - export PATH=/usr/local/bin:/opt/homebrew/Frameworks/Python.framework/Versions/Current/bin:$PATH - brew --version - printf "\e[0Ksection_start:%s:brew_section[collapsed=true]\r\e[0KInstalling prerequisites" "$( date +%s)" - ./tools/macos-setup-brew.sh --install-optional --install-test-deps |