[vlc-commits] [Git][videolan/vlc][master] 2 commits: CI: use CI_JOB_GROUP_NAME to get contribs

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
5defb8ea by Steve Lhomme at 2026-08-14T05:21:23+00:00
CI: use CI_JOB_GROUP_NAME to get contribs

We assume all matrix jobs for a given name will use the same contribs.

- - - - -
48428f83 by Steve Lhomme at 2026-08-14T05:21:23+00:00
CI: use a single job with a matrix for Wasm

So the job name is unique for the contribs.

- - - - -


1 changed file:

- extras/ci/gitlab-ci.yml


Changes:

=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -4,12 +4,12 @@ stages:
 default:
     before_script:
         - set -x
-        - 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.zst"
+        - export VLC_CONTRIB_SHA="$(extras/ci/get-contrib-sha.sh ${CI_JOB_GROUP_NAME##nightly-})"
+        - export VLC_PREBUILT_CONTRIBS_URL="https://artifacts.videolan.org/vlc/${CI_JOB_GROUP_NAME##nightly-}/vlc-contrib-${TRIPLET}-${VLC_CONTRIB_SHA}.tar.zst"
         - if ! extras/ci/check-url.sh "$VLC_PREBUILT_CONTRIBS_URL"; then unset VLC_PREBUILT_CONTRIBS_URL; fi
-        - export BUILD_NIGHTLY="$(extras/ci/is-installer-needed.sh ${CI_JOB_NAME})"
+        - export BUILD_NIGHTLY="$(extras/ci/is-installer-needed.sh ${CI_JOB_GROUP_NAME})"
     after_script:
-        - export VLC_CONTRIB_SHA="$(extras/ci/get-contrib-sha.sh ${CI_JOB_NAME##nightly-})"
+        - export VLC_CONTRIB_SHA="$(extras/ci/get-contrib-sha.sh ${CI_JOB_GROUP_NAME##nightly-})"
         - mv contrib/vlc-contrib-*.tar.zst contrib/vlc-contrib-${TRIPLET}-${VLC_CONTRIB_SHA}.tar.zst 2>/dev/null || true
         - cd contrib && find . -maxdepth 1 -type f -name "vlc-contrib-*-${VLC_CONTRIB_SHA}.tar.zst" -exec sh -c 'tar tf "$0" > /dev/null && shasum -a 512 "$0" | tee SHA512SUM' "{}" \;
     interruptible: true
@@ -161,7 +161,7 @@ variables:
             EXTRA_BUILD_FLAGS="${EXTRA_BUILD_FLAGS} -c"
         fi
         extras/package/win32/build.sh -a $HOST_ARCH $EXTRA_BUILD_FLAGS $LIBVLC_EXTRA_BUILD_FLAGS $UWP_EXTRA_BUILD_FLAGS
-        if [ "${CI_JOB_NAME}" = "win64" ]; then
+        if [ "${CI_JOB_GROUP_NAME}" = "win64" ]; then
           cmake -DLIBVLC_SDK_INC:STRING="${CI_PROJECT_DIR}/include;${CI_PROJECT_DIR}/${VLCARCH}/include" -DLIBVLC_SDK_LIB:STRING=${CI_PROJECT_DIR}/${VLCARCH}/lib/.libs -H${CI_PROJECT_DIR}/doc/libvlc -B${CI_PROJECT_DIR}/doc/libvlc/build \
                 -G Ninja -DCMAKE_C_COMPILER=${TRIPLET}-gcc -DCMAKE_CXX_COMPILER=${TRIPLET}-g++ -DCMAKE_SYSTEM_NAME=Windows
           cmake --build ${CI_PROJECT_DIR}/doc/libvlc/build
@@ -647,33 +647,32 @@ android-x86_64:
 # Webassembly
 #
 
-.wasm32-emscripten-common :
+wasm32-emscripten-build :
     extends: .base-template
     variables: *variables-emscripten-wasm32
+    parallel:
+        matrix:
+            - BUILD_TYPE: Static
+            - BUILD_TYPE: Shared
+              LIBMODE: "--enable-shared"
     image:
         name: $VLC_WASM_EMSCRIPTEN
     script:
         - source $EMSCRIPTEN_SDK/emsdk_env.sh
         - |
-            EXTRA_BUILD_FLAGS="${EXTRA_BUILD_FLAGS} --enable-extra-checks"
+            EXTRA_BUILD_FLAGS="${EXTRA_BUILD_FLAGS} --enable-extra-checks $LIBMODE"
             if [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then
                 echo "Building using prebuilt contribs at $VLC_PREBUILT_CONTRIBS_URL"
                 EXTRA_BUILD_FLAGS="${EXTRA_BUILD_FLAGS} --with-prebuilt-contribs"
             fi
             if [ "${CI_COMMIT_BRANCH}" = "${CI_DEFAULT_BRANCH}" -a "${CI_PROJECT_PATH}" = "videolan/vlc" ]; then
-                EXTRA_BUILD_FLAGS="${EXTRA_BUILD_FLAGS} --gen-contrib-archive"
-            fi
-            if [[ $CI_JOB_NAME == *"shared"* ]]; then
-                EXTRA_BUILD_FLAGS="${EXTRA_BUILD_FLAGS} --enable-shared"
+                if [ "${BUILD_TYPE}" = "Static" ]; then
+                    # only one variant of the matrix should produce the prebuilt tarball
+                    EXTRA_BUILD_FLAGS="${EXTRA_BUILD_FLAGS} --gen-contrib-archive"
+                fi
             fi
             ./extras/package/wasm-emscripten/build.sh $EXTRA_BUILD_FLAGS
 
-wasm32-emscripten-build :
-    extends: .wasm32-emscripten-common
-
-wasm32-emscripten-build-shared :
-    extends: .wasm32-emscripten-common
-
 #
 # VLC Documentation
 #



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/e439692079a75cacb5f07310d1ec2dc20bfd1fe0...48428f8375227a68902871774df1c4b793c95cde

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/e439692079a75cacb5f07310d1ec2dc20bfd1fe0...48428f8375227a68902871774df1c4b793c95cde
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help