From 6771414654a09b4fc8365f769b9c8c2bfcb70cba Mon Sep 17 00:00:00 2001 From: aptalca Date: Sun, 11 Oct 2020 09:56:17 -0400 Subject: [PATCH 1/2] pin to specific commit due to breaking changes --- Jenkinsfile | 31 ++++++++++++------------------- README.md | 1 + jenkins-vars.yml | 3 ++- readme-vars.yml | 1 + 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e82fefd..77cefaa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -101,23 +101,16 @@ pipeline { /* ######################## External Release Tagging ######################## */ - // If this is a github commit trigger determine the current commit at head - stage("Set ENV github_commit"){ - steps{ - script{ - env.EXT_RELEASE = sh( - script: '''curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq -r '. | .sha' | cut -c1-8 ''', - returnStdout: true).trim() - } - } - } - // If this is a github commit trigger Set the external release link - stage("Set ENV commit_link"){ - steps{ - script{ - env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/commit/' + env.EXT_RELEASE - } - } + // If this is a custom command to determine version use that command + stage("Set tag custom bash"){ + steps{ + script{ + env.EXT_RELEASE = sh( + script: ''' printf '6aecc9bd' ''', + returnStdout: true).trim() + env.RELEASE_LINK = 'custom_command' + } + } } // Sanitize the release tag and strip illegal docker or github characters stage("Sanitize tag"){ @@ -696,11 +689,11 @@ pipeline { "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' echo "Pushing New release for Tag" sh '''#! /bin/bash - curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq '. | .commit.message' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json + echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ "target_commitish": "master",\ "name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ - "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start + "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**Remote Changes:**\\n\\n' > start printf '","draft": false,"prerelease": false}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' diff --git a/README.md b/README.md index 74272b0..04b37dd 100644 --- a/README.md +++ b/README.md @@ -218,6 +218,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **11.10.20:** - Pin builds to upstream commit `6aecc9bd` while evaluating the breaking changes upstream. * **27.09.20:** - Updating the external repo endpoint. * **01.06.20:** - Rebasing to alpine 3.12. * **05.11.20:** - Intial Release. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 7ab0372..cbe7453 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -2,7 +2,8 @@ # jenkins variables project_name: docker-synclounge -external_type: github_commit +external_type: na +custom_version_command: "printf '6aecc9bd'" release_type: stable release_tag: latest ls_branch: master diff --git a/readme-vars.yml b/readme-vars.yml index 94fa8f4..461dfb9 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -50,6 +50,7 @@ app_setup_block: | # changelog changelogs: + - { date: "11.10.20:", desc: "Pin builds to upstream commit `6aecc9bd` while evaluating the breaking changes upstream." } - { date: "27.09.20:", desc: "Updating the external repo endpoint." } - { date: "01.06.20:", desc: "Rebasing to alpine 3.12." } - { date: "05.11.20:", desc: "Intial Release." } From 3864762f77d74ab548d2fe81e77f8101b730b594 Mon Sep 17 00:00:00 2001 From: aptalca Date: Sun, 11 Oct 2020 10:40:24 -0400 Subject: [PATCH 2/2] fix typos --- README.md | 2 +- readme-vars.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 04b37dd..7180fcb 100644 --- a/README.md +++ b/README.md @@ -221,4 +221,4 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 * **11.10.20:** - Pin builds to upstream commit `6aecc9bd` while evaluating the breaking changes upstream. * **27.09.20:** - Updating the external repo endpoint. * **01.06.20:** - Rebasing to alpine 3.12. -* **05.11.20:** - Intial Release. +* **11.05.20:** - Initial Release. diff --git a/readme-vars.yml b/readme-vars.yml index 461dfb9..884ca2e 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -53,4 +53,4 @@ changelogs: - { date: "11.10.20:", desc: "Pin builds to upstream commit `6aecc9bd` while evaluating the breaking changes upstream." } - { date: "27.09.20:", desc: "Updating the external repo endpoint." } - { date: "01.06.20:", desc: "Rebasing to alpine 3.12." } - - { date: "05.11.20:", desc: "Intial Release." } + - { date: "11.05.20:", desc: "Initial Release." }