Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
e86183e1 by Steve Lhomme at 2026-02-05T07:07:27+00:00
package/win32: discard installer options when doing a libvlc-only build
If there's is an installation path set (-o <path>) package-win-common
will be done into that path.
- - - - -
259ba25a by Steve Lhomme at 2026-02-05T07:07:27+00:00
package/win32: discard i18n option when doing a libvlc-only build
- - - - -
9d4052bf by Steve Lhomme at 2026-02-05T07:07:27+00:00
CI: use a common variable to trigger the nightly configuration
- - - - -
8703d1cc by Steve Lhomme at 2026-02-05T07:07:27+00:00
CI: check the (Windows) installer files changed to force a nightly rebuild
So we can verify installer changes work.
- - - - -
3 changed files:
- extras/ci/gitlab-ci.yml
- + extras/ci/is-installer-needed.sh
- extras/package/win32/build.sh
Changes:
=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -7,6 +7,7 @@ default:
- 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
+ - export BUILD_NIGHTLY="$(extras/ci/is-installer-needed.sh
${CI_JOB_NAME})"
after_script:
- 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
@@ -147,7 +148,7 @@ variables:
.win-common:
extends: .base-template
script: |
- if [ "${CI_JOB_NAME:0:8}" = "nightly-" ]; then
+ if [ -n "$BUILD_NIGHTLY" ]; then
EXTRA_BUILD_FLAGS="-i n -l"
fi
if [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then
@@ -497,7 +498,7 @@ raspbian-arm:
- .base-template
- .ccache-common-apple
script: |
- if [ "${CI_JOB_NAME:0:8}" = "nightly-" ]; then
+ if [ -n "$BUILD_NIGHTLY" ]; then
NIGHTLY_EXTRA_BUILD_FLAGS="-i n"
else
EXTRA_BUILD_FLAGS="-i z"
=====================================
extras/ci/is-installer-needed.sh
=====================================
@@ -0,0 +1,58 @@
+#!/usr/bin/env bash
+# Copyright (C) Marvin Scholz / Steve Lhomme
+#
+# License: see COPYING
+#
+# Check whether some installer files changed of a nightly is built (needed for
CI)
+# Return "yes" if the installer should be (re)built and "" otherwise
+set -e
+
+# Array of paths that should trigger contrib rebuilds
+VLC_CONTRIB_REBUILD_PATHS=()
+# Revision from which to start look for changes (backwards in time)
+VLC_START_REVISION="HEAD"
+# Upstream branch to compare changes with
+VLC_UPSTREAM_BRANCH="origin/master"
+
+# Print error message and terminate script with status 1
+# Arguments:
+# Message to print
+abort_err()
+{
+ echo "ERROR: $1" >&2
+ exit 1
+}
+
+command -v "git" >/dev/null 2>&1 || abort_err "Git was not found!"
+
+# VLC source root directory
+VLC_SRC_ROOT_DIR=$(git rev-parse --show-toplevel)
+
+[ -n "${VLC_SRC_ROOT_DIR}" ] || abort_err "This script must be run in the VLC
Git repo and git must be available"
+[ -f "${VLC_SRC_ROOT_DIR}/src/libvlc.h" ] || abort_err "This script must be
run in the VLC Git repository"
+
+case $1 in
+ nightly-*)
+ echo "yes"
+ exit 0
+ ;;
+ win32*|win64*|uwp*)
+ # check if the NSIX/WIX folders changed
+ # check if the wix contribs changed
+ # check if gitlab-ci.yml changed as it may influence the nightly build
+ VLC_CONTRIB_REBUILD_PATHS+=( "extras/ci/gitlab-ci.yml"
"extras/package/win32/NSIS" "extras/package/win32/msi" "contrib/src/wix"
"contrib/src/wixlzx" )
+ ;;
+ *)
+ echo ""
+ exit 0
+esac
+
+for path in "${VLC_CONTRIB_REBUILD_PATHS[@]}"; do
+ CHANGED_FILES_IN_PATH=$(git diff --name-only
${VLC_UPSTREAM_BRANCH}..${VLC_START_REVISION} "${path}")
+ if [ -n "${CHANGED_FILES_IN_PATH}" ]; then
+ echo "yes"
+ break
+ fi
+done
+
+exit 0
=====================================
extras/package/win32/build.sh
=====================================
@@ -139,6 +139,11 @@ case $ARCH in
exit 1
esac
+if [ -n "$DISABLEGUI" ]; then
+ INSTALLER=""
+ I18N=""
+fi
+
#####
SCRIPT_PATH="$( cd "$(dirname "$0")" ; pwd -P )"
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/5f0238f9640e1d685607c175498b44d0c58ea375...8703d1cc4a0ad24d6acc2bc3584dc93b9ad31556
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/5f0238f9640e1d685607c175498b44d0c58ea375...8703d1cc4a0ad24d6acc2bc3584dc93b9ad31556
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
