From 9dd68a3cac1020113f4e998016a38e142e99b492 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 15 Feb 2024 10:56:51 +0100
Subject: [PATCH] CI: pass the type of target to get-contrib-sha

So we only update contribs if specific targets have been updated.

The script will have to match the CI target name with a package folder.
---
 doc/BUILD-win32.md      | 4 ++--
 extras/ci/gitlab-ci.yml | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/doc/BUILD-win32.md b/doc/BUILD-win32.md
index c6979f93a8..36f455e7fb 100644
--- a/doc/BUILD-win32.md
+++ b/doc/BUILD-win32.md
@@ -190,7 +190,7 @@ and reuse prebuilt contribs:
 ```sh
 mkdir build
 cd build
-export VLC_CONTRIB_SHA="$(cd ../vlc; extras/ci/get-contrib-sha.sh)"
+export VLC_CONTRIB_SHA="$(cd ../vlc; extras/ci/get-contrib-sha.sh win32)"
 export VLC_PREBUILT_CONTRIBS_URL="https://artifacts.videolan.org/vlc/win64/vlc-contrib-x86_64-w64-mingw32-${VLC_CONTRIB_SHA}.tar.bz2"
 ../vlc/extras/package/win32/build.sh -a x86_64 -p
 ```
@@ -203,7 +203,7 @@ and reuse prebuilt contribs. The name of the prebuilt tarball is the same, but t
 ```sh
 mkdir build
 cd build
-export VLC_CONTRIB_SHA="$(cd ../vlc; extras/ci/get-contrib-sha.sh)"
+export VLC_CONTRIB_SHA="$(cd ../vlc; extras/ci/get-contrib-sha.sh win32)"
 export VLC_PREBUILT_CONTRIBS_URL="https://artifacts.videolan.org/vlc/win64-llvm/vlc-contrib-x86_64-w64-mingw32-$VLC_CONTRIB_SHA.tar.bz2"
 time ../vlc/extras/package/win32/build.sh -a x86_64 -p
 ```
diff --git a/extras/ci/gitlab-ci.yml b/extras/ci/gitlab-ci.yml
index b8ce74ed49..f928914e3c 100644
--- a/extras/ci/gitlab-ci.yml
+++ b/extras/ci/gitlab-ci.yml
@@ -4,11 +4,11 @@ stages:
 default:
     before_script:
         - set -x
-        - export VLC_CONTRIB_SHA="$(extras/ci/get-contrib-sha.sh)"
+        - export VLC_CONTRIB_SHA="$(extras/ci/get-contrib-sha.sh ${CI_JOB_NAME##nightly-})"
         - export VLC_PREBUILT_CONTRIBS_URL="https://artifacts.videolan.org/vlc/${CI_JOB_NAME##nightly-}/vlc-contrib-${TRIPLET}-${VLC_CONTRIB_SHA}.tar.bz2"
         - if ! extras/ci/check-url.sh "$VLC_PREBUILT_CONTRIBS_URL"; then unset VLC_PREBUILT_CONTRIBS_URL; fi
     after_script:
-        - export VLC_CONTRIB_SHA="$(extras/ci/get-contrib-sha.sh)"
+        - export VLC_CONTRIB_SHA="$(extras/ci/get-contrib-sha.sh ${CI_JOB_NAME##nightly-})"
         - mv contrib/vlc-contrib-*.tar.bz2 contrib/vlc-contrib-${TRIPLET}-${VLC_CONTRIB_SHA}.tar.bz2 2>/dev/null || true
         - cd contrib && find . -maxdepth 1 -type f -name "vlc-contrib-*-${VLC_CONTRIB_SHA}.tar.bz2" -exec sh -c 'tar tf "$0" > /dev/null && shasum -a 512 "$0" | tee SHA512SUM' "{}" \;
     interruptible: true
@@ -263,8 +263,7 @@ debian-contrib:
         - contrib/*
         - extras/tools/*
         - extras/ci/*
-        - extras/package/**/*
-        - extras/package/*
+        - extras/package/linux/*
     script: |
         export NCPU=$(getconf _NPROCESSORS_ONLN)
         echo "Building branch '${CI_COMMIT_BRANCH}' (default: '${CI_DEFAULT_BRANCH}')"
@@ -396,7 +395,7 @@ debian-meson:
             cd extras/package/snap
             make -f package.mak snap
     after_script:
-        - export VLC_CONTRIB_SHA="$(extras/ci/get-contrib-sha.sh)"
+        - export VLC_CONTRIB_SHA="$(extras/ci/get-contrib-sha.sh snap)"
         - mv extras/package/snap/parts/vlc/build/contrib/vlc-contrib-*.tar.bz2 contrib/vlc-contrib-${TRIPLET}-${VLC_CONTRIB_SHA}.tar.bz2 2>/dev/null || true
     allow_failure: true
     variables: *variables-snap