Date: Sat, 29 May 2021 03:50:15 GMT From: Jessica Clarke <jrtc27@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: ddd0a8bffe35 - stable/13 - .github: Attempt to un-break Clang 9 action Message-ID: <202105290350.14T3oF2P070648@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=ddd0a8bffe35fce60e71147d3789564ad1997ba3 commit ddd0a8bffe35fce60e71147d3789564ad1997ba3 Author: Jessica Clarke <jrtc27@FreeBSD.org> AuthorDate: 2021-05-29 03:36:36 +0000 Commit: Jessica Clarke <jrtc27@FreeBSD.org> CommitDate: 2021-05-29 03:38:07 +0000 .github: Attempt to un-break Clang 9 action GitHub removed Clang 9 from the 20.04 image[1], breaking this build. Thus, manually add the specific versioned packages we need for the Ubuntu jobs to ensure they're installed. Note that we don't do the same for macOS, as Homebrew does not allow multiple llvm@N to co-exist, giving an error if you attempt to install a second one. In practice we don't actually use the compiler field here for anything other than the build name, it's only the cross-bindir that matters, so when it eventually moves to 12 the name will get confusing but the job will still work. MFC after: immediately [1] https://github.com/actions/virtual-environments/commit/15a610677be406d250c1f6732b03c8b87e693a0a (cherry picked from commit e5f5b6a75c0aa0f51a399e2002d15b51211630b5) --- .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 f002cb0fbbe2..22aa1065d44b 100644 --- a/.github/workflows/cross-bootstrap-tools.yml +++ b/.github/workflows/cross-bootstrap-tools.yml @@ -18,11 +18,11 @@ jobs: - os: ubuntu-20.04 compiler: clang-9 cross-bindir: /usr/lib/llvm-9/bin - pkgs: bmake libarchive-dev + pkgs: bmake libarchive-dev clang-9 lld-9 - os: ubuntu-20.04 compiler: clang-10 cross-bindir: /usr/lib/llvm-10/bin - pkgs: bmake libarchive-dev + pkgs: bmake libarchive-dev clang-10 lld-10 - os: macOS-latest compiler: clang-11 pkgs: bmake libarchive
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105290350.14T3oF2P070648>