Skip to content

Commit 769704e

Browse files
Bot Updating Templated Files
1 parent 975b306 commit 769704e

1 file changed

Lines changed: 13 additions & 7 deletions

File tree

Jenkinsfile

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ pipeline {
522522
--label \"org.opencontainers.image.title=D2-builder\" \
523523
--label \"org.opencontainers.image.description=d2-builder image by linuxserver.io\" \
524524
--no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
525-
--provenance=false --sbom=false --builder=container --load \
525+
--provenance=true --sbom=true --builder=container --load \
526526
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
527527
sh '''#! /bin/bash
528528
set -e
@@ -551,7 +551,9 @@ pipeline {
551551
for i in "${CACHE[@]}"; do
552552
docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
553553
done
554-
wait
554+
for p in $(jobs -p); do
555+
wait "$p" || { echo "job $p failed" >&2; exit 1; }
556+
done
555557
fi
556558
'''
557559
}
@@ -586,7 +588,7 @@ pipeline {
586588
--label \"org.opencontainers.image.title=D2-builder\" \
587589
--label \"org.opencontainers.image.description=d2-builder image by linuxserver.io\" \
588590
--no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
589-
--provenance=false --sbom=false --builder=container --load \
591+
--provenance=true --sbom=true --builder=container --load \
590592
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
591593
sh '''#! /bin/bash
592594
set -e
@@ -615,7 +617,9 @@ pipeline {
615617
for i in "${CACHE[@]}"; do
616618
docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
617619
done
618-
wait
620+
for p in $(jobs -p); do
621+
wait "$p" || { echo "job $p failed" >&2; exit 1; }
622+
done
619623
fi
620624
'''
621625
}
@@ -643,7 +647,7 @@ pipeline {
643647
--label \"org.opencontainers.image.title=D2-builder\" \
644648
--label \"org.opencontainers.image.description=d2-builder image by linuxserver.io\" \
645649
--no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
646-
--provenance=false --sbom=false --builder=container --load \
650+
--provenance=true --sbom=true --builder=container --load \
647651
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
648652
sh '''#! /bin/bash
649653
set -e
@@ -672,7 +676,9 @@ pipeline {
672676
for i in "${CACHE[@]}"; do
673677
docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} &
674678
done
675-
wait
679+
for p in $(jobs -p); do
680+
wait "$p" || { echo "job $p failed" >&2; exit 1; }
681+
done
676682
fi
677683
'''
678684
}
@@ -915,7 +921,7 @@ pipeline {
915921
echo '{"tag_name":"'${META_TAG}'",\
916922
"target_commitish": "main",\
917923
"name": "'${META_TAG}'",\
918-
"body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_REPO}' Changes:**\\n\\n' > start
924+
"body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
919925
printf '","draft": false,"prerelease": false}' >> releasebody.json
920926
paste -d'\\0' start releasebody.json > releasebody.json.done
921927
curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''

0 commit comments

Comments
 (0)