@@ -287,7 +287,7 @@ pipeline {
287287 -v ${WORKSPACE}:/mnt \
288288 -e AWS_ACCESS_KEY_ID=\" ${S3_KEY}\" \
289289 -e AWS_SECRET_ACCESS_KEY=\" ${S3_SECRET}\" \
290- ghcr.io/linuxserver/baseimage-alpine:3.20 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
290+ ghcr.io/linuxserver/baseimage-alpine:3 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
291291 apk add --no-cache python3 && \
292292 python3 -m venv /lsiopy && \
293293 pip install --no-cache-dir -U pip && \
@@ -937,10 +937,10 @@ pipeline {
937937 fi
938938 done
939939 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} || \
940- { [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
940+ { if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
941941 if [ -n "${SEMVER}" ]; then
942942 docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
943- { [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
943+ { if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
944944 fi
945945 done
946946 '''
@@ -966,26 +966,26 @@ pipeline {
966966 fi
967967 done
968968 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} || \
969- { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
969+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
970970 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} || \
971- { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
971+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
972972 if [ -n "${SEMVER}" ]; then
973973 docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
974- { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
974+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
975975 docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
976- { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
976+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
977977 fi
978978 done
979979 for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
980980 docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest || \
981- { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
981+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
982982 docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} || \
983- { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
983+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
984984 docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} || \
985- { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
985+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
986986 if [ -n "${SEMVER}" ]; then
987987 docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} || \
988- { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
988+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
989989 fi
990990 done
991991 '''
@@ -1003,25 +1003,25 @@ pipeline {
10031003 environment name : ' EXIT_STATUS' , value : ' '
10041004 }
10051005 steps {
1006- echo " Auto-generating release notes"
1007- sh ''' if [ "$(git tag --points-at HEAD)" != "" ]; then
1008- echo "Existing tag points to current commit, suggesting no new LS changes"
1009- AUTO_RELEASE_NOTES="No changes"
1010- else
1011- 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 \
1012- -d '{"tag_name":"'${META_TAG}'",\
1013- "target_commitish": "master"}' \
1014- | jq -r '.body' | sed 's|## What.s Changed||')
1015- fi'''
1016- echo " Pushing New tag for current commit ${ META_TAG} "
1017- sh ''' curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
1018- -d '{"tag":"'${META_TAG}'",\
1019- "object": "'${COMMIT_SHA}'",\
1020- "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
1021- "type": "commit",\
1022- "tagger": {"name": "LinuxServer-CI","email": "[email protected] ","date": "'${GITHUB_DATE}'"}}' ''' 1023- echo " Pushing New release for Tag"
10241006 sh ''' #! /bin/bash
1007+ echo "Auto-generating release notes"
1008+ if [ "$(git tag --points-at HEAD)" != "" ]; then
1009+ echo "Existing tag points to current commit, suggesting no new LS changes"
1010+ AUTO_RELEASE_NOTES="No changes"
1011+ else
1012+ 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 \
1013+ -d '{"tag_name":"'${META_TAG}'",\
1014+ "target_commitish": "master"}' \
1015+ | jq -r '.body' | sed 's|## What.s Changed||')
1016+ fi
1017+ echo "Pushing New tag for current commit ${META_TAG}"
1018+ curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
1019+ -d '{"tag":"'${META_TAG}'",\
1020+ "object": "'${COMMIT_SHA}'",\
1021+ "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
1022+ "type": "commit",\
1023+ "tagger": {"name": "LinuxServer-CI","email": "[email protected] ","date": "'${GITHUB_DATE}'"}}' 1024+ echo "Pushing New release for Tag"
10251025 echo "Updating external repo packages to ${EXT_RELEASE_CLEAN}" > releasebody.json
10261026 jq -n \
10271027 --arg tag_name "$META_TAG" \
@@ -1036,7 +1036,8 @@ pipeline {
10361036 "body": ("**CI Report:**\\ n\\ n" + $ci_url + "\\ n\\ n**LinuxServer Changes:**\\ n\\ n" + $ls_notes + "\\ n\\ n**Remote Changes:**\\ n\\ n" + $remote_notes),
10371037 "draft": false,
10381038 "prerelease": false }' > releasebody.json.done
1039- curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
1039+ curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done
1040+ '''
10401041 }
10411042 }
10421043 // Add protection to the release branch
0 commit comments