Skip to content

Commit

Permalink
[GA] Bump native macOS runner versions
Browse files Browse the repository at this point in the history
macOS 11 will be removed from GA on June, 28 2024. Pre-emptively bump
the os runner versions we use.
  • Loading branch information
Fuzzbawls committed Apr 4, 2024
1 parent f428a74 commit ec4e336
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,15 @@ jobs:
cxx: g++

- name: macOS
os: macos-11
os: macos-12
packages: llvm@12 python@3.8 autoconf automake berkeley-db@4 libtool boost@1.76 miniupnpc libnatpmp pkg-config libevent qrencode gmp libsodium rust
no_qt: true
boost_root: true
cc: $(brew --prefix llvm@12)/bin/clang
cxx: $(brew --prefix llvm@12)/bin/clang++

- name: macOS-latest
os: macos-latest
os: macos-14
packages: llvm@13 python@3.8 autoconf automake berkeley-db@4 libtool boost@1.76 miniupnpc libnatpmp pkg-config qt@5 zmq libevent qrencode gmp libsodium rust
boost_root: true
cc: $(brew --prefix llvm@13)/bin/clang
Expand All @@ -115,11 +115,6 @@ jobs:
fi
if [[ ${{ matrix.config.os }} = macos* ]]; then
brew install "$APT_BASE" ${{ matrix.config.packages }}
# GA's macOS 11 image is inconsistent as to if it includes a pre-installed version of boost. Force linking
# to the specified version (1.76), which will overwrite the symlinks to a pre-existing version if it exists.
if [ "${{ matrix.config.os }}" = "macos-11" ]; then
brew link --overwrite -f boost@1.76
fi
fi
- name: ccache cache files
Expand Down Expand Up @@ -188,7 +183,7 @@ jobs:

- name: x64-macOS
id: macOS-nodepends
os: macos-11
os: macos-12
brew_install: autoconf automake ccache berkeley-db@4 libtool boost@1.76 miniupnpc libnatpmp pkg-config python@3.8 libevent qrencode gmp libsodium rust librsvg
unit_tests: true
functional_tests: true
Expand All @@ -198,7 +193,7 @@ jobs:

- name: x64-macOS-latest
id: macOS-nodepends-latest
os: macos-latest
os: macos-14
brew_install: autoconf automake ccache berkeley-db@4 libtool boost@1.76 miniupnpc libnatpmp pkg-config python@3.8 qt@5 zmq libevent qrencode gmp libsodium rust librsvg
unit_tests: true
functional_tests: true
Expand Down

0 comments on commit ec4e336

Please sign in to comment.