@@ -282,7 +282,7 @@ pipeline {
282282 -v ${WORKSPACE}:/mnt \
283283 -e AWS_ACCESS_KEY_ID=\" ${S3_KEY}\" \
284284 -e AWS_SECRET_ACCESS_KEY=\" ${S3_SECRET}\" \
285- ghcr.io/linuxserver/baseimage-alpine:3.20 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
285+ ghcr.io/linuxserver/baseimage-alpine:3 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
286286 apk add --no-cache python3 && \
287287 python3 -m venv /lsiopy && \
288288 pip install --no-cache-dir -U pip && \
@@ -933,10 +933,10 @@ pipeline {
933933 fi
934934 done
935935 docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:latest -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
936- { [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
936+ { if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
937937 if [ -n "${SEMVER}" ]; then
938938 docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
939- { [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
939+ { if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
940940 fi
941941 done
942942 '''
@@ -962,26 +962,26 @@ pipeline {
962962 fi
963963 done
964964 docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-latest -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
965- { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
965+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
966966 docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-latest -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
967- { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
967+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
968968 if [ -n "${SEMVER}" ]; then
969969 docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
970- { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
970+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
971971 docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
972- { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
972+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
973973 fi
974974 done
975975 for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
976976 docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest || \
977- { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
977+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
978978 docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} || \
979- { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
979+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
980980 docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} || \
981- { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
981+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
982982 if [ -n "${SEMVER}" ]; then
983983 docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} || \
984- { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
984+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
985985 fi
986986 done
987987 '''
@@ -999,25 +999,25 @@ pipeline {
999999 environment name : ' EXIT_STATUS' , value : ' '
10001000 }
10011001 steps {
1002- echo " Auto-generating release notes"
1003- sh ''' if [ "$(git tag --points-at HEAD)" != "" ]; then
1004- echo "Existing tag points to current commit, suggesting no new LS changes"
1005- AUTO_RELEASE_NOTES="No changes"
1006- else
1007- 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 \
1008- -d '{"tag_name":"'${META_TAG}'",\
1009- "target_commitish": "master"}' \
1010- | jq -r '.body' | sed 's|## What.s Changed||')
1011- fi'''
1012- echo " Pushing New tag for current commit ${ META_TAG} "
1013- sh ''' curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
1014- -d '{"tag":"'${META_TAG}'",\
1015- "object": "'${COMMIT_SHA}'",\
1016- "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
1017- "type": "commit",\
1018- "tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
1019- echo " Pushing New release for Tag"
10201002 sh ''' #! /bin/bash
1003+ echo "Auto-generating release notes"
1004+ if [ "$(git tag --points-at HEAD)" != "" ]; then
1005+ echo "Existing tag points to current commit, suggesting no new LS changes"
1006+ AUTO_RELEASE_NOTES="No changes"
1007+ else
1008+ 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 \
1009+ -d '{"tag_name":"'${META_TAG}'",\
1010+ "target_commitish": "master"}' \
1011+ | jq -r '.body' | sed 's|## What.s Changed||')
1012+ fi
1013+ echo "Pushing New tag for current commit ${META_TAG}"
1014+ curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
1015+ -d '{"tag":"'${META_TAG}'",\
1016+ "object": "'${COMMIT_SHA}'",\
1017+ "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
1018+ "type": "commit",\
1019+ "tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}'
1020+ echo "Pushing New release for Tag"
10211021 echo "Updating base packages to ${PACKAGE_TAG}" > releasebody.json
10221022 jq -n \
10231023 --arg tag_name "$META_TAG" \
@@ -1032,7 +1032,8 @@ pipeline {
10321032 "body": ("**CI Report:**\\ n\\ n" + $ci_url + "\\ n\\ n**LinuxServer Changes:**\\ n\\ n" + $ls_notes + "\\ n\\ n**Remote Changes:**\\ n\\ n" + $remote_notes),
10331033 "draft": false,
10341034 "prerelease": false }' > releasebody.json.done
1035- curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
1035+ curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done
1036+ '''
10361037 }
10371038 }
10381039 // Add protection to the release branch
0 commit comments