Skip to content

Commit 5a82c71

Browse files
Bot Updating Templated Files
1 parent 93d91f5 commit 5a82c71

1 file changed

Lines changed: 31 additions & 30 deletions

File tree

Jenkinsfile

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ pipeline {
281281
-v ${WORKSPACE}:/mnt \
282282
-e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
283283
-e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
284-
ghcr.io/linuxserver/baseimage-alpine:3.20 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
284+
ghcr.io/linuxserver/baseimage-alpine:3 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
285285
apk add --no-cache python3 && \
286286
python3 -m venv /lsiopy && \
287287
pip install --no-cache-dir -U pip && \
@@ -865,10 +865,10 @@ pipeline {
865865
fi
866866
done
867867
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:debianbookworm -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
868-
{ [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
868+
{ if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
869869
if [ -n "${SEMVER}" ]; then
870870
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
871-
{ [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
871+
{ if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
872872
fi
873873
done
874874
'''
@@ -894,26 +894,26 @@ pipeline {
894894
fi
895895
done
896896
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-debianbookworm -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
897-
{ [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
897+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
898898
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-debianbookworm -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
899-
{ [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
899+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
900900
if [ -n "${SEMVER}" ]; then
901901
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
902-
{ [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
902+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
903903
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
904-
{ [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
904+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
905905
fi
906906
done
907907
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
908908
docker buildx imagetools create -t ${MANIFESTIMAGE}:debianbookworm ${MANIFESTIMAGE}:amd64-debianbookworm ${MANIFESTIMAGE}:arm64v8-debianbookworm || \
909-
{ [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
909+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
910910
docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} || \
911-
{ [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
911+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
912912
docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} || \
913-
{ [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
913+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
914914
if [ -n "${SEMVER}" ]; then
915915
docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} || \
916-
{ [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
916+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
917917
fi
918918
done
919919
'''
@@ -931,25 +931,25 @@ pipeline {
931931
environment name: 'EXIT_STATUS', value: ''
932932
}
933933
steps {
934-
echo "Auto-generating release notes"
935-
sh '''if [ "$(git tag --points-at HEAD)" != "" ]; then
936-
echo "Existing tag points to current commit, suggesting no new LS changes"
937-
AUTO_RELEASE_NOTES="No changes"
938-
else
939-
AUTO_RELEASE_NOTES=$(curl -fsL -H "Authorization: token ${GITHUB_TOKEN}" -H "Accept: application/vnd.github+json" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases/generate-notes \
940-
-d '{"tag_name":"'${META_TAG}'",\
941-
"target_commitish": "master"}' \
942-
| jq -r '.body' | sed 's|## What.s Changed||')
943-
fi'''
944-
echo "Pushing New tag for current commit ${META_TAG}"
945-
sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
946-
-d '{"tag":"'${META_TAG}'",\
947-
"object": "'${COMMIT_SHA}'",\
948-
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
949-
"type": "commit",\
950-
"tagger": {"name": "LinuxServer-CI","email": "[email protected]","date": "'${GITHUB_DATE}'"}}' '''
951-
echo "Pushing New release for Tag"
952934
sh '''#! /bin/bash
935+
echo "Auto-generating release notes"
936+
if [ "$(git tag --points-at HEAD)" != "" ]; then
937+
echo "Existing tag points to current commit, suggesting no new LS changes"
938+
AUTO_RELEASE_NOTES="No changes"
939+
else
940+
AUTO_RELEASE_NOTES=$(curl -fsL -H "Authorization: token ${GITHUB_TOKEN}" -H "Accept: application/vnd.github+json" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases/generate-notes \
941+
-d '{"tag_name":"'${META_TAG}'",\
942+
"target_commitish": "master"}' \
943+
| jq -r '.body' | sed 's|## What.s Changed||')
944+
fi
945+
echo "Pushing New tag for current commit ${META_TAG}"
946+
curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
947+
-d '{"tag":"'${META_TAG}'",\
948+
"object": "'${COMMIT_SHA}'",\
949+
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
950+
"type": "commit",\
951+
"tagger": {"name": "LinuxServer-CI","email": "[email protected]","date": "'${GITHUB_DATE}'"}}'
952+
echo "Pushing New release for Tag"
953953
echo "Updating base packages to ${PACKAGE_TAG}" > releasebody.json
954954
jq -n \
955955
--arg tag_name "$META_TAG" \
@@ -964,7 +964,8 @@ pipeline {
964964
"body": ("**CI Report:**\\n\\n" + $ci_url + "\\n\\n**LinuxServer Changes:**\\n\\n" + $ls_notes + "\\n\\n**Remote Changes:**\\n\\n" + $remote_notes),
965965
"draft": false,
966966
"prerelease": true }' > releasebody.json.done
967-
curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
967+
curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done
968+
'''
968969
}
969970
}
970971
// Add protection to the release branch

0 commit comments

Comments
 (0)