Skip to content

Commit 2f316b6

Browse files
LinuxServer-CILinuxServer-CI
committed
Bot Updating Templated Files
1 parent 5a58e1f commit 2f316b6

File tree

1 file changed

+31
-30
lines changed

1 file changed

+31
-30
lines changed

‎Jenkinsfile‎

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ pipeline {
276276
-v ${WORKSPACE}:/mnt \
277277
-e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
278278
-e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
279-
ghcr.io/linuxserver/baseimage-alpine:3.20 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
279+
ghcr.io/linuxserver/baseimage-alpine:3 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
280280
apk add --no-cache python3 && \
281281
python3 -m venv /lsiopy && \
282282
pip install --no-cache-dir -U pip && \
@@ -862,10 +862,10 @@ pipeline {
862862
fi
863863
done
864864
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} || \
865-
{ [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
865+
{ if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
866866
if [ -n "${SEMVER}" ]; then
867867
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
868-
{ [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
868+
{ if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
869869
fi
870870
done
871871
'''
@@ -891,26 +891,26 @@ pipeline {
891891
fi
892892
done
893893
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} || \
894-
{ [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
894+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
895895
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} || \
896-
{ [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
896+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
897897
if [ -n "${SEMVER}" ]; then
898898
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${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-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
901-
{ [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
901+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
902902
fi
903903
done
904904
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
905905
docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest || \
906-
{ [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
906+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
907907
docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} || \
908-
{ [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
908+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
909909
docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} || \
910-
{ [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
910+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
911911
if [ -n "${SEMVER}" ]; then
912912
docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} || \
913-
{ [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
913+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
914914
fi
915915
done
916916
'''
@@ -928,25 +928,25 @@ pipeline {
928928
environment name: 'EXIT_STATUS', value: ''
929929
}
930930
steps {
931-
echo "Auto-generating release notes"
932-
sh '''if [ "$(git tag --points-at HEAD)" != "" ]; then
933-
echo "Existing tag points to current commit, suggesting no new LS changes"
934-
AUTO_RELEASE_NOTES="No changes"
935-
else
936-
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 \
937-
-d '{"tag_name":"'${META_TAG}'",\
938-
"target_commitish": "master"}' \
939-
| jq -r '.body' | sed 's|## What.s Changed||')
940-
fi'''
941-
echo "Pushing New tag for current commit ${META_TAG}"
942-
sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
943-
-d '{"tag":"'${META_TAG}'",\
944-
"object": "'${COMMIT_SHA}'",\
945-
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
946-
"type": "commit",\
947-
"tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
948-
echo "Pushing New release for Tag"
949931
sh '''#! /bin/bash
932+
echo "Auto-generating release notes"
933+
if [ "$(git tag --points-at HEAD)" != "" ]; then
934+
echo "Existing tag points to current commit, suggesting no new LS changes"
935+
AUTO_RELEASE_NOTES="No changes"
936+
else
937+
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 \
938+
-d '{"tag_name":"'${META_TAG}'",\
939+
"target_commitish": "master"}' \
940+
| jq -r '.body' | sed 's|## What.s Changed||')
941+
fi
942+
echo "Pushing New tag for current commit ${META_TAG}"
943+
curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
944+
-d '{"tag":"'${META_TAG}'",\
945+
"object": "'${COMMIT_SHA}'",\
946+
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
947+
"type": "commit",\
948+
"tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}'
949+
echo "Pushing New release for Tag"
950950
echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json
951951
jq -n \
952952
--arg tag_name "$META_TAG" \
@@ -961,7 +961,8 @@ pipeline {
961961
"body": ("**CI Report:**\\n\\n" + $ci_url + "\\n\\n**LinuxServer Changes:**\\n\\n" + $ls_notes + "\\n\\n**Remote Changes:**\\n\\n" + $remote_notes),
962962
"draft": false,
963963
"prerelease": false }' > releasebody.json.done
964-
curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
964+
curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done
965+
'''
965966
}
966967
}
967968
// Add protection to the release branch

0 commit comments

Comments
 (0)