From 386e2dc442f46d2c4b43dc9e767eaa93facdbb42 Mon Sep 17 00:00:00 2001 From: Andrew Turner Date: Thu, 29 Aug 2024 17:45:43 +0100 Subject: [PATCH] .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 1f4d41cce30..c0be25d3b67 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