diff options
| author | Jessica Clarke <jrtc27@FreeBSD.org> | 2022-06-30 20:03:26 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2023-02-22 20:47:12 +0000 |
| commit | bc68c55166ada973141542c9c719f562475cb80c (patch) | |
| tree | 8be5c62b920f162b2bf6208dd8aea47398675cca | |
| parent | ff5b04fddebd129be42a60e7ee8666c9286db57c (diff) | |
| download | src-bc68c55166ada973141542c9c719f562475cb80c.tar.gz src-bc68c55166ada973141542c9c719f562475cb80c.zip | |
.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.
(cherry picked from commit 22f731486e80fdbf679712b2a99605ba97a50264)
| -rw-r--r-- | .github/workflows/cross-bootstrap-tools.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/cross-bootstrap-tools.yml b/.github/workflows/cross-bootstrap-tools.yml index c6df31e4fbee..9630470d0420 100644 --- a/.github/workflows/cross-bootstrap-tools.yml +++ b/.github/workflows/cross-bootstrap-tools.yml @@ -30,8 +30,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 |