From 424f8ad521411532c56f9176c9f588ede7768a93 Mon Sep 17 00:00:00 2001 From: thespad Date: Mon, 28 Oct 2024 16:19:32 +0000 Subject: [PATCH] Option for simplifying everything + handle no CI_URL --- .../generate-jenkins/templates/Jenkinsfile.j2 | 27 +------------------ 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/roles/generate-jenkins/templates/Jenkinsfile.j2 b/roles/generate-jenkins/templates/Jenkinsfile.j2 index 4a007690..e60d78ec 100644 --- a/roles/generate-jenkins/templates/Jenkinsfile.j2 +++ b/roles/generate-jenkins/templates/Jenkinsfile.j2 @@ -1156,32 +1156,7 @@ pipeline { echo '{"tag_name":"'${META_TAG}'",\ "target_commitish": "{{ ls_branch }}",\ "name": "'${META_TAG}'",\ -{% if custom_version_command is defined %} - "body": "**CI Report:**\\n\\n'${CI_URL}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start -{% endif %} -{% if external_type == "github_devel" %} - "body": "**CI Report:**\\n\\n'${CI_URL}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_REPO}' Changes:**\\n\\n' > start -{% elif external_type == "github_stable" %} - "body": "**CI Report:**\\n\\n'${CI_URL}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_REPO}' Changes:**\\n\\n' > start -{% elif external_type == "alpine_repo" %} - "body": "**CI Report:**\\n\\n'${CI_URL}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Repo Changes:**\\n\\n' > start -{% elif external_type == "custom_json" %} - "body": "**CI Report:**\\n\\n'${CI_URL}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start -{% elif external_type == "deb_repo" %} - "body": "**CI Report:**\\n\\n'${CI_URL}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Repo Changes:**\\n\\n' > start -{% elif external_type == "external_blob" %} - "body": "**CI Report:**\\n\\n'${CI_URL}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start -{% elif external_type == "github_commit" %} - "body": "**CI Report:**\\n\\n'${CI_URL}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_REPO}' Changes:**\\n\\n' > start -{% elif external_type == "gitlab_commit" %} - "body": "**CI Report:**\\n\\n'${CI_URL}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_GITLAB_PROJ}' Changes:**\\n\\n' > start -{% elif external_type == "npm_version" %} - "body": "**CI Report:**\\n\\n'${CI_URL}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**NPM Changes:**\\n\\n' > start -{% elif external_type == "os" %} - "body": "**CI Report:**\\n\\n'${CI_URL}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**OS Changes:**\\n\\n' > start -{% elif external_type == "pip_version" %} - "body": "**CI Report:**\\n\\n'${CI_URL}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**PIP Changes:**\\n\\n' > start -{% elif external_type == "custom" %} "body": "**CI Report:**\\n\\n'${CI_URL}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Custom Changes:**\\n\\n' > start{% endif %} + "body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start printf '","draft": false,"prerelease": {% if release_type == "stable" %}false{% elif release_type == "prerelease" %}true{% endif %}}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''