[vlc-commits] [Git][videolan/vlc][master] 2 commits: extras: ci: split contrib from debian job

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
91e79ded by Alexandre Janniaux at 2023-08-27T15:32:05+00:00
extras: ci: split contrib from debian job

The debian job is not using the contribs at all, split the job in two so
that it can be parallelized more easily and so that the debian job
reflect the time it took to build VLC.

Note that it notably changes the folder where debian contribs are
uploaded.

- - - - -
5ff972ea by Alexandre Janniaux at 2023-08-27T15:32:05+00:00
extras: ci: remove contribs from the meson job

The meson job will not use the contribs, and the contribs are already
built separately in the debian-contrib job, so remove them from the
build.

- - - - -


1 changed file:

- extras/ci/gitlab-ci.yml


Changes:

=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -253,7 +253,7 @@ nightly-win64-arm-llvm:
 #
 # Debian
 #
-debian:
+debian-contrib:
     extends: .base-template
     image:
         name: $VLC_DEBIAN_IMAGE
@@ -284,7 +284,16 @@ debian:
         else
             make -j$NCPU --output-sync=recurse tools
         fi
-        cd ../../
+    variables:
+        <<: *variables-debian
+
+debian:
+    extends: .base-template
+    image:
+        name: $VLC_DEBIAN_IMAGE
+    script: |
+        export NCPU=$(getconf _NPROCESSORS_ONLN)
+        echo "Building branch '${CI_COMMIT_BRANCH}' (default: '${CI_DEFAULT_BRANCH}')"
 
         # Configure VLC
         ./bootstrap
@@ -326,31 +335,6 @@ debian-meson:
             ( cd extras/tools && make -j$NCPU .buildmeson )
             export PATH="$(pwd)/extras/tools/build/bin:$PATH"
             echo -e "\e[0Ksection_end:$(date +%s):build_tools_section\r\e[0K"
-
-        - |
-            echo -e "\e[0Ksection_start:$(date +%s):build_contribs_section\r\e[0KContribs build"
-            # Build contribs
-            mkdir -p contrib/contrib-$TRIPLET && cd contrib/contrib-$TRIPLET
-            ../bootstrap --enable-x262
-            if [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then
-                echo "Building using prebuilt contribs at $VLC_PREBUILT_CONTRIBS_URL"
-                make prebuilt PREBUILT_URL="${VLC_PREBUILT_CONTRIBS_URL}" || PREBUILT_FAILED=yes
-            else
-                PREBUILT_FAILED=yes
-            fi
-            if [ -n "$PREBUILT_FAILED" ]; then
-                make list
-                make -j$NCPU --output-sync=recurse fetch
-                make -j$NCPU --output-sync=recurse
-                if [ "${CI_COMMIT_BRANCH}" = "${CI_DEFAULT_BRANCH}" ]; then
-                    make package
-                fi
-            else
-                make -j$NCPU --output-sync=recurse tools
-            fi
-            cd ../../
-            echo -e "\e[0Ksection_end:$(date +%s):build_contribs_section\r\e[0K"
-
         - |
             echo -e "\e[0Ksection_start:$(date +%s):setup_meson_section\r\e[0KMeson setup"
             # Setup meson build dir



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/910a50f6bb516f9cb7b6330b27dd5c27a63b2af1...5ff972ea2a98327cb937c91bd89e330f69b26641

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/910a50f6bb516f9cb7b6330b27dd5c27a63b2af1...5ff972ea2a98327cb937c91bd89e330f69b26641
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance