From 3cbfa7ab59d37b53724c15fed55a4880745db6a6 Mon Sep 17 00:00:00 2001 From: Nullptrderef Date: Sun, 16 Jun 2024 13:56:11 +0200 Subject: generate ci targets --- contrib/ci/ci.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'contrib/ci/ci.sh') diff --git a/contrib/ci/ci.sh b/contrib/ci/ci.sh index f454a6e3b..611977bd3 100755 --- a/contrib/ci/ci.sh +++ b/contrib/ci/ci.sh @@ -9,8 +9,11 @@ JOB_NAME="${1}" JOB_ARCH=$((grep CONTAINER_ARCH contrib/ci/jobs/${JOB_NAME}/config.ini | cut -d' ' -f 3) || echo "${2:-amd64}") JOB_CONTAINER=$((grep CONTAINER_NAME contrib/ci/jobs/${JOB_NAME}/config.ini | cut -d' ' -f 3) || echo "localhost/${REPO_NAME}:${JOB_ARCH}") CONTAINER_BUILD=$((grep CONTAINER_BUILD contrib/ci/jobs/${JOB_NAME}/config.ini | cut -d' ' -f 3) || echo "True") -CONTAINERFILE="contrib/ci/$JOB_ARCH.Containerfile" +CONTAINERFILE="contrib/ci/jobs/${JOB_NAME}/Containerfile" +if ! [[ -f "$CONTAINERFILE" ]]; then + CONTAINERFILE="contrib/ci/$JOB_ARCH.Containerfile" +fi; if ! [[ -f "$CONTAINERFILE" ]]; then CONTAINERFILE="$(dirname "$CONTAINERFILE")/Containerfile" fi; -- cgit v1.2.3