Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 5 Jun 2023 16:01:44 GMT
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 99b983ffe737 - stable/13 - Cirrus-CI: switch to -lite LLVM package for native run
Message-ID:  <202306051601.355G1iaE065686@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by emaste:

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

commit 99b983ffe737fa2cb7bd5b2f1cc0f6b6b8d5fe9e
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-05-17 18:16:06 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-06-05 14:35:28 +0000

    Cirrus-CI: switch to -lite LLVM package for native run
    
    This reduces CI cycle time (a small amount).
    
    Suggested by:   brooks
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D40136
    
    (cherry picked from commit f326a83c857066754cbc92c59e1904a68af37deb)
---
 .cirrus.yml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 1c6bb1d8e5a4..0e3fea9e3776 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -20,27 +20,31 @@ task:
     env:
       TARGET: amd64
       TARGET_ARCH: amd64
-      TOOLCHAIN_PKG: llvm15
+      TOOLCHAIN: llvm15
+      TOOLCHAIN_PKG: ${TOOLCHAIN}-lite
   - name: World and kernel arm64 build and boot smoke test
     only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src'
     trigger_type: manual
     env:
       TARGET: arm64
       TARGET_ARCH: aarch64
-      TOOLCHAIN_PKG: llvm15
+      TOOLCHAIN: llvm15
+      TOOLCHAIN_PKG: ${TOOLCHAIN}
   - name: World and kernel gcc12 amd64 build and boot smoke test (manual)
     only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src'
     trigger_type: manual
     env:
       TARGET: amd64
       TARGET_ARCH: amd64
-      TOOLCHAIN_PKG: amd64-gcc12
+      TOOLCHAIN: amd64-gcc12
+      TOOLCHAIN_PKG: ${TOOLCHAIN}
   - name: World and kernel gcc12 amd64 build and boot smoke test (FreeBSD repo)
     only_if: $CIRRUS_REPO_FULL_NAME == 'freebsd/freebsd-src'
     env:
       TARGET: amd64
       TARGET_ARCH: amd64
-      TOOLCHAIN_PKG: amd64-gcc12
+      TOOLCHAIN: amd64-gcc12
+      TOOLCHAIN_PKG: ${TOOLCHAIN}
   timeout_in: 120m
   install_script:
   - sh .cirrus-ci/pkg-install.sh ${TOOLCHAIN_PKG}
@@ -53,9 +57,9 @@ task:
   - mkdir -p /usr/obj/$(pwd -P)
   - chown user:user /usr/obj/$(pwd -P)
   script:
-  - su user -c "make -j$(sysctl -n hw.ncpu) CROSS_TOOLCHAIN=${TOOLCHAIN_PKG} WITHOUT_TOOLCHAIN=yes buildworld buildkernel"
+  - su user -c "make -j$(sysctl -n hw.ncpu) CROSS_TOOLCHAIN=${TOOLCHAIN} WITHOUT_TOOLCHAIN=yes buildworld buildkernel"
   package_script:
-  - su user -c "make CROSS_TOOLCHAIN=${TOOLCHAIN_PKG} WITHOUT_TOOLCHAIN=yes packages"
+  - su user -c "make CROSS_TOOLCHAIN=${TOOLCHAIN} WITHOUT_TOOLCHAIN=yes packages"
   package_check_script:
   - su user -c "/usr/libexec/flua tools/pkgbase/metalog_reader.lua -c /usr/obj/$(pwd -P)/${TARGET}.${TARGET_ARCH}/worldstage/METALOG"
   test_script:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306051601.355G1iaE065686>