git: 22f731486e80 - main - .github: Attempt to fix and increase robustness of macOS action

The branch main has been updated by jrtc27:

URL: https://cgit.FreeBSD.org/src/commit/?id=22f731486e80fdbf679712b2a99605ba97a50264

commit 22f731486e80fdbf679712b2a99605ba97a50264
Author:     Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2022-06-30 20:03:26 +0000
Commit:     Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2022-06-30 20:03:26 +0000

    .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.
---
 .github/workflows/cross-bootstrap-tools.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cross-bootstrap-tools.yml b/.github/workflows/cross-bootstrap-tools.yml
index 2d981b3fdff2..ce50bc9cb36e 100644
--- a/.github/workflows/cross-bootstrap-tools.yml
+++ b/.github/workflows/cross-bootstrap-tools.yml
@@ -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