[vlc-commits] [Git][videolan/vlc][3.0.x] 5 commits: CI/appleOS: use tools available on the runner

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC


Commits:
731469b0 by Felix Paul Kühne at 2025-10-13T13:24:39+00:00
CI/appleOS: use tools available on the runner

(cherry picked from commit 27948cbf566a6f06f92b9ac354c69fb80fe0e019) (edited)
edited:
- there is no apple-os-common on 3.0

- - - - -
79023faa by Steve Lhomme at 2025-10-13T13:24:39+00:00
ci: generate a contrib package if Windows prebuilt were used but failed

If the previous prebuilt was broken we have a fresh one to use.

(cherry picked from commit ee926f4251d123fa68a4f814d5ec2e1e1cc45388)

- - - - -
677a5b5d by Marvin Scholz at 2025-10-13T13:24:39+00:00
CI: macosx: package zip instead of dmg

(only for non-nightly, nightlies still package a dmg as before)

(cherry picked from commit 155036d4a4a071ac21812f0d6723e5c531ed4a08)

- - - - -
56096270 by Steve Lhomme at 2025-10-13T13:24:39+00:00
CI: only generate a contrib tarball if we're on the main branch

There's no need to generate the tarball since it's not going to be used by
anyone else. It's only used on master after a merge or in nightly builds.

This should save a few minutes during each contrib MR builds.

(cherry picked from commit b4d374071298e944d31ddaba51d317c72b006204)

- - - - -
ee9412bc by Steve Lhomme at 2025-10-13T13:24:39+00:00
CI: only generate the contrib tarball on master after the merge

The rebased branch before merging has a different CI_PROJECT_PATH.
The tarball will not be used, so no need to create it.
It will be created and used in the build on the videolan/vlc account.

(cherry picked from commit d0f931107bcc0fcc54e6e01de9588576fa81b73b) (edited)
edited:
- 3.0 doesn't have debian-contrib, raspbian-arm, wasm32

- - - - -


1 changed file:

- extras/ci/gitlab-ci.yml


Changes:

=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -108,14 +108,16 @@ variables:
     extends: .docker-template
     script: |
         if [ "${CI_JOB_NAME:0:8}" = "nightly-" ]; then
-            NIGHTLY_EXTRA_BUILD_FLAGS="-i n -l"
+            EXTRA_BUILD_FLAGS="-i n -l"
         fi
         if [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then
             echo "Building using prebuilt contribs at $VLC_PREBUILT_CONTRIBS_URL"
-            extras/package/win32/build.sh -p -a $HOST_ARCH $NIGHTLY_EXTRA_BUILD_FLAGS $LIBVLC_EXTRA_BUILD_FLAGS $UWP_EXTRA_BUILD_FLAGS
-        else
-            extras/package/win32/build.sh -c -a $HOST_ARCH $NIGHTLY_EXTRA_BUILD_FLAGS $LIBVLC_EXTRA_BUILD_FLAGS $UWP_EXTRA_BUILD_FLAGS
+            EXTRA_BUILD_FLAGS="${EXTRA_BUILD_FLAGS} -p"
+        fi
+        if [ "${CI_COMMIT_BRANCH}" = "${CI_DEFAULT_BRANCH}" -a "${CI_PROJECT_PATH}" = "videolan/vlc" ]; then
+            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
 
 win32:
     extends: .win-common
@@ -300,7 +302,9 @@ debian:
         else
             make -j$NCPU --output-sync=recurse fetch
             make -j$NCPU --output-sync=recurse
-            make package
+            if [ "${CI_COMMIT_BRANCH}" = "${CI_DEFAULT_BRANCH}" -a "${CI_PROJECT_PATH}" = "videolan/vlc" ]; then
+                make package
+            fi
         fi
         cd ../../
 
@@ -369,12 +373,18 @@ nightly-snap:
     script: |
         if [ "${CI_JOB_NAME:0:8}" = "nightly-" ]; then
             NIGHTLY_EXTRA_BUILD_FLAGS="-i n"
+        else
+            EXTRA_BUILD_FLAGS="-i z"
         fi
         if [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then
             echo "Building using prebuilt contribs at $VLC_PREBUILT_CONTRIBS_URL"
         else
-            EXTRA_BUILD_FLAGS="-c -p"
+            EXTRA_BUILD_FLAGS="${EXTRA_BUILD_FLAGS} -c"
+        fi
+        if [ "${CI_COMMIT_BRANCH}" = "${CI_DEFAULT_BRANCH}" -a "${CI_PROJECT_PATH}" = "videolan/vlc" ]; then
+            EXTRA_BUILD_FLAGS="${EXTRA_BUILD_FLAGS} -p"
         fi
+        export PATH="${VLC_PATH}:$PATH"
         mkdir build && cd build
         ../extras/package/macosx/build.sh $EXTRA_BUILD_FLAGS -a $HOST_ARCH -k $VLC_SDK_PATH $NIGHTLY_EXTRA_BUILD_FLAGS
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/75c51d778a5b492fb775cb605658ef3fe811e1a4...ee9412bc0feaa5351736830ef7683a6ac8512d41

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/75c51d778a5b492fb775cb605658ef3fe811e1a4...ee9412bc0feaa5351736830ef7683a6ac8512d41
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance