@@ -294,7 +294,7 @@ pipeline {
294294 -v ${WORKSPACE}:/mnt \
295295 -e AWS_ACCESS_KEY_ID=\" ${S3_KEY}\" \
296296 -e AWS_SECRET_ACCESS_KEY=\" ${S3_SECRET}\" \
297- ghcr.io/linuxserver/baseimage-alpine:3.20 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
297+ ghcr.io/linuxserver/baseimage-alpine:3 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
298298 apk add --no-cache python3 && \
299299 python3 -m venv /lsiopy && \
300300 pip install --no-cache-dir -U pip && \
@@ -945,10 +945,10 @@ pipeline {
945945 fi
946946 done
947947 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} || \
948- { [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
948+ { if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
949949 if [ -n "${SEMVER}" ]; then
950950 docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
951- { [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
951+ { if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
952952 fi
953953 done
954954 '''
@@ -974,26 +974,26 @@ pipeline {
974974 fi
975975 done
976976 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} || \
977- { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
977+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
978978 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} || \
979- { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
979+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
980980 if [ -n "${SEMVER}" ]; then
981981 docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
982- { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
982+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
983983 docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
984- { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
984+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
985985 fi
986986 done
987987 for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
988988 docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest || \
989- { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
989+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
990990 docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} || \
991- { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
991+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
992992 docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} || \
993- { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
993+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
994994 if [ -n "${SEMVER}" ]; then
995995 docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} || \
996- { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
996+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi ; }
997997 fi
998998 done
999999 '''
@@ -1011,26 +1011,26 @@ pipeline {
10111011 environment name : ' EXIT_STATUS' , value : ' '
10121012 }
10131013 steps {
1014- echo " Auto-generating release notes"
1015- sh ''' if [ "$(git tag --points-at HEAD)" != "" ]; then
1016- echo "Existing tag points to current commit, suggesting no new LS changes"
1017- AUTO_RELEASE_NOTES="No changes"
1018- else
1019- 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 \
1020- -d '{"tag_name":"'${META_TAG}'",\
1021- "target_commitish": "master"}' \
1022- | jq -r '.body' | sed 's|## What.s Changed||')
1023- fi'''
1024- echo " Pushing New tag for current commit ${ META_TAG} "
1025- sh ''' curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
1026- -d '{"tag":"'${META_TAG}'",\
1027- "object": "'${COMMIT_SHA}'",\
1028- "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
1029- "type": "commit",\
1030- "tagger": {"name": "LinuxServer-CI","email": "[email protected] ","date": "'${GITHUB_DATE}'"}}' ''' 1031- echo " Pushing New release for Tag"
10321014 sh ''' #! /bin/bash
1033- curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq '. |.body' | sed 's:^.\\ (.*\\ ).$:\\ 1:' > releasebody.json
1015+ echo "Auto-generating release notes"
1016+ if [ "$(git tag --points-at HEAD)" != "" ]; then
1017+ echo "Existing tag points to current commit, suggesting no new LS changes"
1018+ AUTO_RELEASE_NOTES="No changes"
1019+ else
1020+ 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 \
1021+ -d '{"tag_name":"'${META_TAG}'",\
1022+ "target_commitish": "master"}' \
1023+ | jq -r '.body' | sed 's|## What.s Changed||')
1024+ fi
1025+ echo "Pushing New tag for current commit ${META_TAG}"
1026+ curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
1027+ -d '{"tag":"'${META_TAG}'",\
1028+ "object": "'${COMMIT_SHA}'",\
1029+ "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
1030+ "type": "commit",\
1031+ "tagger": {"name": "LinuxServer-CI","email": "[email protected] ","date": "'${GITHUB_DATE}'"}}' 1032+ echo "Pushing New release for Tag"
1033+ curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. |.body' > releasebody.json
10341034 jq -n \
10351035 --arg tag_name "$META_TAG" \
10361036 --arg target_commitish "master" \
@@ -1044,7 +1044,8 @@ pipeline {
10441044 "body": ("**CI Report:**\\ n\\ n" + $ci_url + "\\ n\\ n**LinuxServer Changes:**\\ n\\ n" + $ls_notes + "\\ n\\ n**Remote Changes:**\\ n\\ n" + $remote_notes),
10451045 "draft": false,
10461046 "prerelease": false }' > releasebody.json.done
1047- curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
1047+ curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done
1048+ '''
10481049 }
10491050 }
10501051 // Add protection to the release branch
0 commit comments