[vlc-commits] [Git][videolan/vlc][master] Revert "CI: use a single job with a matrix for Wasm"

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
11b36ad1 by Steve Lhomme at 2026-08-15T07:17:18+02:00
Revert "CI: use a single job with a matrix for Wasm"

For this optimization to work, it required that the script to move the tarball
knew about the group name in addition to the job name. But Gitlab doesn't provide
this. And we can't really tweak the job name when using grouped jobs...

This reverts commit 48428f8375227a68902871774df1c4b793c95cde.

- - - - -


1 changed file:

- extras/ci/gitlab-ci.yml


Changes:

=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -647,32 +647,33 @@ android-x86_64:
 # Webassembly
 #
 
-wasm32-emscripten-build :
+.wasm32-emscripten-common :
     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 $LIBMODE"
+            EXTRA_BUILD_FLAGS="${EXTRA_BUILD_FLAGS} --enable-extra-checks"
             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
-                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
+                EXTRA_BUILD_FLAGS="${EXTRA_BUILD_FLAGS} --gen-contrib-archive"
+            fi
+            if [[ $CI_JOB_NAME == *"shared"* ]]; then
+                EXTRA_BUILD_FLAGS="${EXTRA_BUILD_FLAGS} --enable-shared"
             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/-/commit/11b36ad142cde9354864625c6d5cbde1c21c9538

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/11b36ad142cde9354864625c6d5cbde1c21c9538
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