fix artifact retrieval

Author: aptalca

.github/workflows/external_trigger.yml

@@ -111,8 +111,7 @@ jobs:
             exit 0
           else
             assets=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/mltframework/shotcut/releases/tags/${EXT_RELEASE}" | jq -r '.assets[].browser_download_url')
-            SHOTCUT_SHORT_VER=$(echo ${EXT_RELEASE} | sed 's|[v.]||g')
-            if grep -q "shotcut-linux-x86_64-${SHOTCUT_SHORT_VER}.txz$" <<< "${assets}"; then
+            if grep -q "x86_64" | grep -q ".txz" <<< "${assets}"; then
               artifacts_found="true"
             else
               artifacts_found="false"

Dockerfile

@@ -31,10 +31,11 @@ RUN \
     SHOTCUT_RELEASE=$(curl -sX GET "https://api.github.com/repos/mltframework/shotcut/releases/latest" \
     | jq -r .tag_name); \
   fi && \
-  SHOTCUT_SHORT_VER=$(echo ${SHOTCUT_RELEASE} | sed 's|[v.]||g') && \
-  curl -o \
+  SHOTCUT_URL=$(curl -sX GET "https://api.github.com/repos/mltframework/shotcut/releases/tags/${SHOTCUT_RELEASE}" | jq -r '.assets[].browser_download_url' \
+    | grep "x86_64" | grep ".txz") && \
+  curl -fo \
     /tmp/shotcut-tarball.txz -L \
-    "https://github.com/mltframework/shotcut/releases/download/${SHOTCUT_RELEASE}/shotcut-linux-x86_64-${SHOTCUT_SHORT_VER}.txz" && \
+    "${SHOTCUT_URL}" && \
   tar xvf /tmp/shotcut-tarball.txz -C \
     /app/shotcut --strip-components=2 && \
   echo "**** cleanup ****" && \

jenkins-vars.yml

@@ -8,8 +8,7 @@ release_tag: latest
 ls_branch: main
 external_artifact_check: |
   assets=$(curl -u "${{ '{{' }} secrets.CR_USER {{ '}}' }}:${{ '{{' }} secrets.CR_PAT {{ '}}' }}" -sX GET "https://api.github.com/repos/mltframework/shotcut/releases/tags/${EXT_RELEASE}" | jq -r '.assets[].browser_download_url')
-  SHOTCUT_SHORT_VER=$(echo ${EXT_RELEASE} | sed 's|[v.]||g')
-  if grep -q "shotcut-linux-x86_64-${SHOTCUT_SHORT_VER}.txz$" <<< "${assets}"; then
+  if grep -q "x86_64" | grep -q ".txz" <<< "${assets}"; then
     artifacts_found="true"
   else
     artifacts_found="false"