Merge pull request #57 from linuxserver/development-prerelease

build pre-releases instead of commits
2026-02-20 01:02:49 +08:00 · 2021-03-14 14:34:55 +01:00 · 2021-03-14 14:34:55 +01:00 · b656911304
commit b656911304
parent 4746e5e458 814c80d47c
8 changed files with 30 additions and 29 deletions
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@ -18,7 +18,7 @@ jobs:
          fi
          echo "**** External trigger running off of development branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_BAZARR_DEVELOPMENT\". ****"
          echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/morpheus65535/bazarr/commits/development" | jq -r '. | .sha' | cut -c1-8)
+          EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/morpheus65535/bazarr/releases" | jq -r '.[0] | .tag_name')
          if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
            echo "**** Can't retrieve external version, exiting ****"
            FAILURE_REASON="Can't retrieve external version for bazarr branch development"
--- a/5
+++ b/5
@ -14,6 +14,7 @@ RUN \
 apk add --no-cache --virtual=build-dependencies \
 	g++ \
 	gcc \
+	jq \
 	libxml2-dev \
 	libxslt-dev \
 	py3-pip \
@ -29,8 +30,8 @@ RUN \
 	unzip && \
 echo "**** install bazarr ****" && \
 if [ -z ${BAZARR_VERSION+x} ]; then \
-	BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/commits/development \
-	| awk '/sha/{print $4;exit}' FS='[""]'); \
+	BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/releases \
+	| jq -r '.[0] | .tag_name'); \
 fi && \
 curl -o \
 /tmp/bazarr.tar.gz -L \
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@ -14,6 +14,7 @@ RUN \
 apk add --no-cache --virtual=build-dependencies \
 	g++ \
 	gcc \
+	jq \
 	libxml2-dev \
 	libxslt-dev \
 	py3-pip \
@ -29,8 +30,8 @@ RUN \
 	unzip && \
 echo "**** install bazarr ****" && \
 if [ -z ${BAZARR_VERSION+x} ]; then \
-	BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/commits/development \
-	| awk '/sha/{print $4;exit}' FS='[""]'); \
+	BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/releases \
+	| jq -r '.[0] | .tag_name'); \
 fi && \
 curl -o \
 /tmp/bazarr.tar.gz -L \
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@ -14,6 +14,7 @@ RUN \
 apk add --no-cache --virtual=build-dependencies \
 	g++ \
 	gcc \
+	jq \
 	libxml2-dev \
 	libxslt-dev \
 	py3-pip \
@ -29,8 +30,8 @@ RUN \
 	unzip && \
 echo "**** install bazarr ****" && \
 if [ -z ${BAZARR_VERSION+x} ]; then \
-	BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/commits/development \
-	| awk '/sha/{print $4;exit}' FS='[""]'); \
+	BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/releases \
+	| jq -r '.[0] | .tag_name'); \
 fi && \
 curl -o \
 /tmp/bazarr.tar.gz -L \
--- a/36
+++ b/36
@ -27,8 +27,6 @@ pipeline {
    DEV_DOCKERHUB_IMAGE = 'lsiodev/bazarr'
    PR_DOCKERHUB_IMAGE = 'lspipepr/bazarr'
    DIST_IMAGE = 'alpine'
-    DIST_TAG = '3.8'
-    DIST_PACKAGES = 'none'
    MULTIARCH='true'
    CI='true'
    CI_WEB='true'
@ -103,23 +101,23 @@ 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 devel github release use the first in an array from github to determine the ext tag
+    stage("Set ENV github_devel"){
+      steps{
+        script{
+          env.EXT_RELEASE = sh(
+            script: '''curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases | jq -r '.[0] | .tag_name' ''',
+            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 stable or devel github release generate the link for the build message
+    stage("Set ENV github_link"){
+      steps{
+        script{
+          env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/releases/tag/' + env.EXT_RELEASE
+        }
+      }
    }
    // Sanitize the release tag and strip illegal docker or github characters
    stage("Sanitize tag"){
@ -748,7 +746,7 @@ 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
+              curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases | jq '.[0] |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json
              echo '{"tag_name":"'${META_TAG}'",\
                     "target_commitish": "development",\
                     "name": "'${META_TAG}'",\
--- a/README.md
+++ b/README.md
@ -230,6 +230,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

 ## Versions

+* **13.03.21:** - Build from Github pre-releases.
 * **23.01.21:** - Rebasing to alpine 3.13.
 * **23.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information.
 * **19.12.19:** - Rebasing to alpine 3.12.
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@ -2,7 +2,7 @@

 # jenkins variables
 project_name: docker-bazarr
-external_type: github_commit
+external_type: github_devel
 release_type: prerelease
 release_tag: development
 ls_branch: development
@ -18,8 +18,6 @@ repo_vars:
  - DEV_DOCKERHUB_IMAGE = 'lsiodev/bazarr'
  - PR_DOCKERHUB_IMAGE = 'lspipepr/bazarr'
  - DIST_IMAGE = 'alpine'
-  - DIST_TAG = '3.8'
-  - DIST_PACKAGES = 'none'
  - MULTIARCH='true'
  - CI='true'
  - CI_WEB='true'
--- a/readme-vars.yml
+++ b/readme-vars.yml
@ -46,6 +46,7 @@ app_setup_block: |

 # changelog
 changelogs:
+  - { date: "13.03.21:", desc: "Build from Github pre-releases." }
  - { date: "23.01.21:", desc: "Rebasing to alpine 3.13." }
  - { date: "23.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." }
  - { date: "19.12.19:", desc: "Rebasing to alpine 3.12." }