Skip to content

Commit 8fd8b53

Browse files
Bot Updating Templated Files
1 parent 2bf0c07 commit 8fd8b53

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

Jenkinsfile

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ pipeline {
529529
--label \"org.opencontainers.image.title=Jenkins-builder\" \
530530
--label \"org.opencontainers.image.description=jenkins-builder image by linuxserver.io\" \
531531
--no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
532-
--provenance=false --sbom=false --builder=container --load \
532+
--provenance=true --sbom=true --builder=container --load \
533533
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
534534
sh '''#! /bin/bash
535535
set -e
@@ -558,7 +558,9 @@ pipeline {
558558
for i in "${CACHE[@]}"; do
559559
docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
560560
done
561-
wait
561+
for p in $(jobs -p); do
562+
wait "$p" || { echo "job $p failed" >&2; exit 1; }
563+
done
562564
fi
563565
'''
564566
}
@@ -593,7 +595,7 @@ pipeline {
593595
--label \"org.opencontainers.image.title=Jenkins-builder\" \
594596
--label \"org.opencontainers.image.description=jenkins-builder image by linuxserver.io\" \
595597
--no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
596-
--provenance=false --sbom=false --builder=container --load \
598+
--provenance=true --sbom=true --builder=container --load \
597599
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
598600
sh '''#! /bin/bash
599601
set -e
@@ -622,7 +624,9 @@ pipeline {
622624
for i in "${CACHE[@]}"; do
623625
docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
624626
done
625-
wait
627+
for p in $(jobs -p); do
628+
wait "$p" || { echo "job $p failed" >&2; exit 1; }
629+
done
626630
fi
627631
'''
628632
}
@@ -650,7 +654,7 @@ pipeline {
650654
--label \"org.opencontainers.image.title=Jenkins-builder\" \
651655
--label \"org.opencontainers.image.description=jenkins-builder image by linuxserver.io\" \
652656
--no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
653-
--provenance=false --sbom=false --builder=container --load \
657+
--provenance=true --sbom=true --builder=container --load \
654658
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
655659
sh '''#! /bin/bash
656660
set -e
@@ -679,7 +683,9 @@ pipeline {
679683
for i in "${CACHE[@]}"; do
680684
docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} &
681685
done
682-
wait
686+
for p in $(jobs -p); do
687+
wait "$p" || { echo "job $p failed" >&2; exit 1; }
688+
done
683689
fi
684690
'''
685691
}
@@ -922,7 +928,7 @@ pipeline {
922928
echo '{"tag_name":"'${META_TAG}'",\
923929
"target_commitish": "master",\
924930
"name": "'${META_TAG}'",\
925-
"body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**OS Changes:**\\n\\n' > start
931+
"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
926932
printf '","draft": false,"prerelease": false}' >> releasebody.json
927933
paste -d'\\0' start releasebody.json > releasebody.json.done
928934
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)