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.

This commit is contained in:

Muhammad Moinur Rahman

2025-12-17 21:47:47 +01:00

parent 1a26b161d8

commit 4d185f5457

1 changed files with 4 additions and 4 deletions

									
										tests/ci/Makefile
									
		+4
		-4
	
												View File
												
				@@ -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

				.endif