Date: Wed, 17 Dec 2025 22:05:18 +0000 From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 4d185f54576a - main - tests/ci: Fix building in Github Message-ID: <6943291e.47a11.6658ab6c@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/src/commit/?id=4d185f54576acc6542e894e5d11d92bd7383eb27 commit 4d185f54576acc6542e894e5d11d92bd7383eb27 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2025-12-17 20:47:47 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2025-12-17 22:05:10 +0000 tests/ci: Fix building in Github When we are using Cirrus-CI and using a PR branch it creates a filename in the form "pull/XXXX" which becomes a path seperator and the file creation process fails. Fails to complete the process with the following: /bin/sh: cannot create /tmp/meta.hUNGUq/ci-FreeBSD-16.0-pull/1932-amd64-nullhash-GENERIC.env: No such file or directory For future also apply the same regex for OSRELEASE and VOLUME_LABEL. --- tests/ci/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/ci/Makefile b/tests/ci/Makefile index a750b1265169..02b20eea58a6 100644 --- a/tests/ci/Makefile +++ b/tests/ci/Makefile @@ -59,11 +59,11 @@ ${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../../sys/conf/newvers.sh); ec . endfor . for _V in ${TARGET_ARCH} . if !empty(TARGET:M${_V}) -OSRELEASE= ${TYPE}-${REVISION}-${BRANCH}-${TARGET} -VOLUME_LABEL= ${REVISION:C/[.-]/_/g}_${BRANCH:C/[.-]/_/g}_${TARGET} +OSRELEASE= ${TYPE}-${REVISION}-${BRANCH:C/[.-\/]/_/g}-${TARGET} +VOLUME_LABEL= ${REVISION:C/[.-]/_/g}_${BRANCH:C/[.-\/]/_/g}_${TARGET} . else -OSRELEASE= ${TYPE}-${REVISION}-${BRANCH}-${TARGET}-${TARGET_ARCH} -VOLUME_LABEL= ${REVISION:C/[.-]/_/g}_${BRANCH:C/[.-]/_/g}_${TARGET_ARCH} +OSRELEASE= ${TYPE}-${REVISION}-${BRANCH:C/[.-\/]/_/g}-${TARGET}-${TARGET_ARCH} +VOLUME_LABEL= ${REVISION:C/[.-]/_/g}_${BRANCH:C/[.-\/]/_/g}_${TARGET_ARCH} . endif . endfor .endifhelp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6943291e.47a11.6658ab6c>