.github: Attempt to fix and increase robustness of macOS action
Homebrew has added LLVM 14 and made that the default version, but GitHub continues to install LLVM 13 for now, so it ends up only accessible via the versioned name and not the unversioned one. We also add an explicit installation of llvm@13 so that, if GitHub updates the image to using LLVM 14, the action continues to work, albeit slightly more slowly. This also ensures the compiler label remains correct rather than outdated, as has occurred in the past, and that we don't get new versions of LLVM before we're ready for them, which is especially relevant for stable branches. This all mirrors how the Ubuntu jobs are configured.
This commit is contained in:
parent
91b30f7ad2
commit
22f731486e
4
.github/workflows/cross-bootstrap-tools.yml
vendored
4
.github/workflows/cross-bootstrap-tools.yml
vendored
@ -27,8 +27,8 @@ jobs:
|
||||
pkgs: bmake libarchive-dev clang-14 lld-14
|
||||
- os: macos-latest
|
||||
compiler: clang-13
|
||||
cross-bindir: /usr/local/opt/llvm/bin
|
||||
pkgs: bmake libarchive
|
||||
cross-bindir: /usr/local/opt/llvm@13/bin
|
||||
pkgs: bmake libarchive llvm@13
|
||||
- target_arch: amd64
|
||||
target: amd64
|
||||
- target_arch: aarch64
|
||||
|
Loading…
Reference in New Issue
Block a user