From 0da88faf46c6b2f627708be882bf523491ffbf7b Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Tue, 1 Jul 2025 10:05:37 -0400 Subject: [PATCH] fix trigger --- .github/workflows/external_trigger.yml | 2 +- Jenkinsfile | 2 +- jenkins-vars.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 42964fc..2118cb0 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -26,7 +26,7 @@ jobs: echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY echo "> External trigger running off of master branch. To disable this trigger, add \`digikam_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY - EXT_RELEASE=$(curl -sL https://mirrors.mit.edu/kde/stable/digikam/ | awk -F'(="./|/")' '/href=".\/[0-9]/ {print $2}') + EXT_RELEASE=$(curl -sL https://mirrors.mit.edu/kde/stable/digikam/ | awk -F'(="./|/")' '/href=".\/[0-9]/ {print $2}' | sort -rn | head -n 1) echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY if grep -q "^digikam_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY diff --git a/Jenkinsfile b/Jenkinsfile index 2ce7f9d..2bd1c35 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -143,7 +143,7 @@ pipeline { steps{ script{ env.EXT_RELEASE = sh( - script: ''' curl -sL https://mirrors.mit.edu/kde/stable/digikam/ | awk -F'(="./|/")' '/href=".\\/[0-9]/ {print $2}' ''', + script: ''' curl -sL https://mirrors.mit.edu/kde/stable/digikam/ | awk -F'(="./|/")' '/href=".\\/[0-9]/ {print $2}' | sort -rn | head -n 1 ''', returnStdout: true).trim() env.RELEASE_LINK = 'custom_command' } diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 3e65af7..3afa002 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -3,7 +3,7 @@ # jenkins variables project_name: docker-digikam external_type: na -custom_version_command: "curl -sL https://mirrors.mit.edu/kde/stable/digikam/ | awk -F'(=\"./|/\")' '/href=\".\\\\/[0-9]/ {print $2}'" +custom_version_command: "curl -sL https://mirrors.mit.edu/kde/stable/digikam/ | awk -F'(=\"./|/\")' '/href=\".\\\\/[0-9]/ {print $2}' | sort -rn | head -n 1" release_type: stable release_tag: latest ls_branch: master