git: e8b7c78c1b38 - main - Cirrus-CI: switch to llvm18 by default

From: Ed Maste <emaste_at_FreeBSD.org>
Date: Sun, 07 Apr 2024 21:23:48 UTC
The branch main has been updated by emaste:

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

commit e8b7c78c1b38d0486ff12993c0529a201030bd07
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2024-04-06 21:53:17 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-04-07 21:23:25 +0000

    Cirrus-CI: switch to llvm18 by default
    
    As of commit 439352ac8257 Clang/LLVM 18 is the default in-tree compiler.
    Follow suit in with the external toolchain package used by Cirrus-CI.
    
    Sponsored by:   The FreeBSD Foundation
---
 .cirrus.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 90d031a919f2..13719a3e2058 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -23,15 +23,15 @@ task:
       TOOLCHAIN: llvm16
       TOOLCHAIN_PKG: ${TOOLCHAIN}-lite
   - name: amd64-llvm17 World and kernel build and boot smoke test
-    only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' || $CIRRUS_BRANCH =~ 'pull/.*'
+    only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src'
+    trigger_type: manual
     env:
       TARGET: amd64
       TARGET_ARCH: amd64
       TOOLCHAIN: llvm17
       TOOLCHAIN_PKG: ${TOOLCHAIN}-lite
   - name: amd64-llvm18 World and kernel build and boot smoke test
-    only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src'
-    trigger_type: manual
+    only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' || $CIRRUS_BRANCH =~ 'pull/.*'
     env:
       TARGET: amd64
       TARGET_ARCH: amd64