git: 089d1ed94c07 - stable/13 - Cirrus-CI: move QEMU pkg installation to test script
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 05 Jun 2023 16:01:42 UTC
The branch stable/13 has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=089d1ed94c0708c4ef9ba13c121294904750d5f1
commit 089d1ed94c0708c4ef9ba13c121294904750d5f1
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2022-09-07 14:12:37 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-06-05 14:35:06 +0000
Cirrus-CI: move QEMU pkg installation to test script
Occasionally the QEMU package fails to build and isn't available on
-CURRENT using the Latest package set. Move the package installation
to the test script, so that if the package isn't available we at least
still perform a build test.
Sponsored by: The FreeBSD Foundation
(cherry picked from commit 612f254c82468d037fccb6c26dc0a7e37a73a53e)
---
.cirrus.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.cirrus.yml b/.cirrus.yml
index 3270040aba40..eeb4bf83fb07 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -41,7 +41,7 @@ task:
TOOLCHAIN_PKG: amd64-gcc12
timeout_in: 120m
install_script:
- - sh .cirrus-ci/pkg-install.sh qemu-nox11 ${TOOLCHAIN_PKG}
+ - sh .cirrus-ci/pkg-install.sh ${TOOLCHAIN_PKG}
setup_script:
- uname -a
- gpart show
@@ -57,6 +57,7 @@ task:
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:
+ - sh .cirrus-ci/pkg-install.sh qemu-nox11
- sh tools/boot/ci-qemu-test.sh
post_script:
- df -m