Skip to content

Commit 9c1c54d

Browse files
LinuxServer-CILinuxServer-CI
committed
Bot Updating Templated Files
1 parent 8861d2d commit 9c1c54d

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
@@ -283,7 +283,7 @@ pipeline {
283283
-v ${WORKSPACE}:/mnt \
284284
-e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
285285
-e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
286-
ghcr.io/linuxserver/baseimage-alpine:3.20 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
286+
ghcr.io/linuxserver/baseimage-alpine:3 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
287287
apk add --no-cache python3 && \
288288
python3 -m venv /lsiopy && \
289289
pip install --no-cache-dir -U pip && \
@@ -867,10 +867,10 @@ pipeline {
867867
fi
868868
done
869869
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:arch -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
870-
{ [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
870+
{ if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
871871
if [ -n "${SEMVER}" ]; then
872872
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
873-
{ [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
873+
{ if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
874874
fi
875875
done
876876
'''
@@ -896,26 +896,26 @@ pipeline {
896896
fi
897897
done
898898
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-arch -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
899-
{ [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
899+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
900900
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-arch -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
901-
{ [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
901+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
902902
if [ -n "${SEMVER}" ]; then
903903
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
904-
{ [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
904+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
905905
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
906-
{ [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
906+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
907907
fi
908908
done
909909
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
910910
docker buildx imagetools create -t ${MANIFESTIMAGE}:arch ${MANIFESTIMAGE}:amd64-arch ${MANIFESTIMAGE}:arm64v8-arch || \
911-
{ [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
911+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
912912
docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} || \
913-
{ [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
913+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
914914
docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} || \
915-
{ [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
915+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
916916
if [ -n "${SEMVER}" ]; then
917917
docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} || \
918-
{ [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
918+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
919919
fi
920920
done
921921
'''
@@ -933,25 +933,25 @@ pipeline {
933933
environment name: 'EXIT_STATUS', value: ''
934934
}
935935
steps {
936-
echo "Auto-generating release notes"
937-
sh '''if [ "$(git tag --points-at HEAD)" != "" ]; then
938-
echo "Existing tag points to current commit, suggesting no new LS changes"
939-
AUTO_RELEASE_NOTES="No changes"
940-
else
941-
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 \
942-
-d '{"tag_name":"'${META_TAG}'",\
943-
"target_commitish": "arch"}' \
944-
| jq -r '.body' | sed 's|## What.s Changed||')
945-
fi'''
946-
echo "Pushing New tag for current commit ${META_TAG}"
947-
sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
948-
-d '{"tag":"'${META_TAG}'",\
949-
"object": "'${COMMIT_SHA}'",\
950-
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to arch",\
951-
"type": "commit",\
952-
"tagger": {"name": "LinuxServer-CI","email": "[email protected]","date": "'${GITHUB_DATE}'"}}' '''
953-
echo "Pushing New release for Tag"
954936
sh '''#! /bin/bash
937+
echo "Auto-generating release notes"
938+
if [ "$(git tag --points-at HEAD)" != "" ]; then
939+
echo "Existing tag points to current commit, suggesting no new LS changes"
940+
AUTO_RELEASE_NOTES="No changes"
941+
else
942+
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 \
943+
-d '{"tag_name":"'${META_TAG}'",\
944+
"target_commitish": "arch"}' \
945+
| jq -r '.body' | sed 's|## What.s Changed||')
946+
fi
947+
echo "Pushing New tag for current commit ${META_TAG}"
948+
curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
949+
-d '{"tag":"'${META_TAG}'",\
950+
"object": "'${COMMIT_SHA}'",\
951+
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to arch",\
952+
"type": "commit",\
953+
"tagger": {"name": "LinuxServer-CI","email": "[email protected]","date": "'${GITHUB_DATE}'"}}'
954+
echo "Pushing New release for Tag"
955955
echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json
956956
jq -n \
957957
--arg tag_name "$META_TAG" \
@@ -966,7 +966,8 @@ pipeline {
966966
"body": ("**CI Report:**\\n\\n" + $ci_url + "\\n\\n**LinuxServer Changes:**\\n\\n" + $ls_notes + "\\n\\n**Remote Changes:**\\n\\n" + $remote_notes),
967967
"draft": false,
968968
"prerelease": true }' > releasebody.json.done
969-
curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
969+
curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done
970+
'''
970971
}
971972
}
972973
// Add protection to the release branch

0 commit comments

Comments
 (0)