From 51c6bf0478bd331225121eb4a0a60510cc3920b1 Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 29 Feb 2024 17:00:39 -0500
Subject: [PATCH] Cirrus-CI: bump Clang versions to 16 and 17

Clang/LLVM 17 is currently the in-tree default compiler, so use it as
the default Cirrus-CI toolchain.  Clang/LLVM 18 is coming soon and needs
to be added here, but I ran into trouble with llvm18-lite package
availability so will look at that later.

Reviewed by:	dim (earlier), Jose Luis Duran
Sponsored by:	The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D44162
---
 .cirrus.yml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 96fbb873136c..d84614321145 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -14,29 +14,21 @@ env:
 
 task:
   matrix:
-  - name: amd64-llvm15 World and kernel build and boot smoke test
+  - name: amd64-llvm16 World and kernel build and boot smoke test
     only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src'
     trigger_type: manual
-    env:
-      TARGET: amd64
-      TARGET_ARCH: amd64
-      TOOLCHAIN: llvm15
-      TOOLCHAIN_PKG: ${TOOLCHAIN}-lite
-  - name: amd64-llvm16 World and kernel build and boot smoke test
-    only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' || $CIRRUS_BRANCH =~ 'pull/.*'
     env:
       TARGET: amd64
       TARGET_ARCH: amd64
       TOOLCHAIN: llvm16
       TOOLCHAIN_PKG: ${TOOLCHAIN}-lite
-  - name: arm64-llvm15 World and kernel build and boot smoke test
-    only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src'
-    trigger_type: manual
+  - name: amd64-llvm17 World and kernel build and boot smoke test
+    only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' || $CIRRUS_BRANCH =~ 'pull/.*'
     env:
-      TARGET: arm64
-      TARGET_ARCH: aarch64
-      TOOLCHAIN: llvm15
-      TOOLCHAIN_PKG: ${TOOLCHAIN}
+      TARGET: amd64
+      TARGET_ARCH: amd64
+      TOOLCHAIN: llvm17
+      TOOLCHAIN_PKG: ${TOOLCHAIN}-lite
   - name: arm64-llvm16 World and kernel build and boot smoke test
     only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src'
     trigger_type: manual
@@ -45,6 +37,14 @@ task:
       TARGET_ARCH: aarch64
       TOOLCHAIN: llvm16
       TOOLCHAIN_PKG: ${TOOLCHAIN}
+  - name: arm64-llvm17 World and kernel build and boot smoke test
+    only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src'
+    trigger_type: manual
+    env:
+      TARGET: arm64
+      TARGET_ARCH: aarch64
+      TOOLCHAIN: llvm17
+      TOOLCHAIN_PKG: ${TOOLCHAIN}
   - name: amd64-gcc12 World and kernel build and boot smoke test (manual)
     only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src'
     trigger_type: manual