git: 386e2dc442f4 - main - .github: Use the two most recent LTS releases

From: Andrew Turner <andrew_at_FreeBSD.org>
Date: Mon, 21 Oct 2024 12:24:27 UTC
The branch main has been updated by andrew:

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

commit 386e2dc442f46d2c4b43dc9e767eaa93facdbb42
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2024-08-29 16:45:43 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2024-10-21 12:23:16 +0000

    .github: Use the two most recent LTS releases
    
    Ubuntu 24.04 is the most recent LTS release. Use it and the previous
    22.04 LTS for cross build testing.
    
    Reported by:    emaste, jhb
    Sponsored by:   Arm Ltd
    Pull Request:   https://github.com/freebsd/freebsd-src/pull/1399
---
 .github/workflows/cross-bootstrap-tools.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/cross-bootstrap-tools.yml b/.github/workflows/cross-bootstrap-tools.yml
index 1f4d41cce30c..c0be25d3b67c 100644
--- a/.github/workflows/cross-bootstrap-tools.yml
+++ b/.github/workflows/cross-bootstrap-tools.yml
@@ -18,17 +18,17 @@ jobs:
       fail-fast: false
       matrix:
         target_arch: [ amd64, aarch64 ]
-        os: [ ubuntu-20.04, ubuntu-22.04, macos-latest ]
+        os: [ ubuntu-22.04, ubuntu-24.04, macos-latest ]
         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-12
-            cross-bindir: /usr/lib/llvm-12/bin
-            pkgs: bmake libarchive-dev clang-12 lld-12
           - os: ubuntu-22.04
             compiler: clang-14
             cross-bindir: /usr/lib/llvm-14/bin
             pkgs: bmake libarchive-dev clang-14 lld-14
+          - os: ubuntu-24.04
+            compiler: clang-18
+            cross-bindir: /usr/lib/llvm-18/bin
+            pkgs: bmake libarchive-dev clang-18 lld-18
           - os: macos-latest
             compiler: clang-13
             cross-bindir: /opt/homebrew/opt/llvm@13/bin