From 908ef3058ad0db333162190cea731257f994e441 Mon Sep 17 00:00:00 2001
From: thespad <git@spad.co.uk>
Date: Tue, 14 May 2024 15:02:55 +0100
Subject: [PATCH] Use short commit sha to avoid horrible tags

---
 .github/workflows/external_trigger.yml | 2 +-
 Dockerfile                             | 2 +-
 Dockerfile.aarch64                     | 2 +-
 Jenkinsfile                            | 2 +-
 jenkins-vars.yml                       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml
index aea3869..7a6ab45 100644
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@@ -20,7 +20,7 @@ jobs:
           echo "**** External trigger running off of testing branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_NZBGET_TESTING\". ****"
           echo "External trigger running off of testing branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_NZBGET_TESTING\`" >> $GITHUB_STEP_SUMMARY
           echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/nzbgetcom/nzbget/git/matching-refs/tags/testing" | jq -r '. | .[].object.sha')
+          EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/nzbgetcom/nzbget/git/matching-refs/tags/testing" | jq -r '. | .[].object.sha[:7]')
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
             echo "**** Can't retrieve external version, exiting ****"
             FAILURE_REASON="Can't retrieve external version for nzbget branch testing"
diff --git a/Dockerfile b/Dockerfile
index 283dba9..e8e6845 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@ RUN \
   echo "**** build nzbget ****" && \
   if [ -z ${NZBGET_RELEASE+x} ]; then \
     NZBGET_RELEASE=$(curl -sX GET "https://api.github.com/repos/nzbgetcom/nzbget/git/matching-refs/tags/testing" \
-    | jq -r '.[].object.sha'); \
+    | jq -r '.[].object.sha[:7]'); \
   fi && \
   mkdir -p /nzbget && \
   git clone https://github.com/nzbgetcom/nzbget.git nzbget && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 3b73502..2b69422 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -21,7 +21,7 @@ RUN \
   echo "**** build nzbget ****" && \
   if [ -z ${NZBGET_RELEASE+x} ]; then \
     NZBGET_RELEASE=$(curl -sX GET "https://api.github.com/repos/nzbgetcom/nzbget/git/matching-refs/tags/testing" \
-    | jq -r '.[].object.sha'); \
+    | jq -r '.[].object.sha[:7]'); \
   fi && \
   mkdir -p /nzbget && \
   git clone https://github.com/nzbgetcom/nzbget.git nzbget && \
diff --git a/Jenkinsfile b/Jenkinsfile
index dd32440..4f22966 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,7 +18,7 @@ pipeline {
     GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
     DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat')
     JSON_URL = 'https://api.github.com/repos/nzbgetcom/nzbget/git/matching-refs/tags/testing'
-    JSON_PATH = '.[].object.sha'
+    JSON_PATH = '.[].object.sha[:7]'
     BUILD_VERSION_ARG = 'NZBGET_RELEASE'
     LS_USER = 'linuxserver'
     LS_REPO = 'docker-nzbget'
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index d3f2b70..f500e10 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -8,7 +8,7 @@ release_tag: testing
 ls_branch: testing
 repo_vars:
   - JSON_URL = 'https://api.github.com/repos/nzbgetcom/nzbget/git/matching-refs/tags/testing'
-  - JSON_PATH = '.[].object.sha'
+  - JSON_PATH = '.[].object.sha[:7]'
   - BUILD_VERSION_ARG = 'NZBGET_RELEASE'
   - LS_USER = 'linuxserver'
   - LS_REPO = 'docker-nzbget'