git: f85c2be7d532 - stable/13 - .github: Update compilers used for cross-build testing.

From: John Baldwin <jhb_at_FreeBSD.org>
Date: Wed, 13 Jul 2022 18:44:57 UTC
The branch stable/13 has been updated by jhb:

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

commit f85c2be7d53276d2b890878884113252701b7901
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-06-09 17:20:02 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-07-13 18:44:26 +0000

    .github: Update compilers used for cross-build testing.
    
    - Drop clang 9 build, and switch the remaining ubuntu build to
      the more modern clang 12.
    
    - Update the label for the macos-latest builds which are now using
      clang 13 rather than clang 12.
    
    Reviewed by:    uqs
    Pull Request:   https://github.com/freebsd/freebsd-src/pull/599
    
    (cherry picked from commit 49335eda0f5d80e9c86754b5ed95a285b49ef166)
---
 .github/workflows/cross-bootstrap-tools.yml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/cross-bootstrap-tools.yml b/.github/workflows/cross-bootstrap-tools.yml
index 7666dfdcf2c7..fbe8fc936706 100644
--- a/.github/workflows/cross-bootstrap-tools.yml
+++ b/.github/workflows/cross-bootstrap-tools.yml
@@ -16,15 +16,11 @@ jobs:
         include:
           # TODO: both Ubuntu and macOS have bmake packages, we should try them instead of bootstrapping our own copy.
           - os: ubuntu-20.04
-            compiler: clang-9
-            cross-bindir: /usr/lib/llvm-9/bin
-            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 clang-10 lld-10
-          - os: macos-latest
             compiler: clang-12
+            cross-bindir: /usr/lib/llvm-12/bin
+            pkgs: bmake libarchive-dev clang-12 lld-12
+          - os: macos-latest
+            compiler: clang-13
             cross-bindir: /usr/local/opt/llvm/bin
             pkgs: bmake libarchive
     steps: