Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
39a9d6ce by Steve Lhomme at 2024-08-08T11:42:05+00:00
CI: emscripten: only generate the contrib tarball on master after the merge
Similar to d0f931107bcc0fcc54e6e01de9588576fa81b73b for emscipten.
- - - - -
720499ee by Steve Lhomme at 2024-08-08T11:42:05+00:00
CI: apple: only generate the contrib tarball on master after the merge
Similar to d0f931107bcc0fcc54e6e01de9588576fa81b73b for iOS/tvOS/xrOS/watchOS.
- - - - -
1 changed file:
- extras/ci/gitlab-ci.yml
Changes:
=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -568,13 +568,14 @@ nightly-macos-arm64:
script: |
export PATH="${VLC_PATH}:$PATH"
mkdir build && cd build
+ EXTRA_BUILD_FLAGS="${EXTRA_BUILD_FLAGS} --enable-extra-checks"
if [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then
- ../extras/package/apple/build.sh --sdk=$SDKNAME --arch=$HOST_ARCH
--package-contribs \
- --enable-extra-checks --with-prebuilt-contribs
- else
- ../extras/package/apple/build.sh --sdk=$SDKNAME --arch=$HOST_ARCH
--package-contribs \
- --enable-extra-checks
+ EXTRA_BUILD_FLAGS="${EXTRA_BUILD_FLAGS} --package-contribs"
+ fi
+ if [ "${CI_COMMIT_BRANCH}" = "${CI_DEFAULT_BRANCH}" -a
"${CI_PROJECT_PATH}" = "videolan/vlc" ]; then
+ EXTRA_BUILD_FLAGS="${EXTRA_BUILD_FLAGS} --with-prebuilt-contribs"
fi
+ ../extras/package/apple/build.sh --sdk=$SDKNAME --arch=$HOST_ARCH
$EXTRA_BUILD_FLAGS
ios-arm64:
extends: .apple-os-common
@@ -624,7 +625,7 @@ xros-arm64:
(cd libvlcjni && git checkout 5076ef767eb4126c74a496033ace54649ac200e7)
if [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then
CONTRIB_FLAGS="--with-prebuilt-contribs"
- else
+ elif [ "${CI_COMMIT_BRANCH}" = "${CI_DEFAULT_BRANCH}" -a
"${CI_PROJECT_PATH}" = "videolan/vlc" ]; then
CONTRIB_FLAGS="--package-contribs"
fi
EXTRA_PARAMS="--enable-extra-checks" /bin/sh
./libvlcjni/buildsystem/compile-libvlc.sh --no-jni -a $ANDROID_ARCH
$CONTRIB_FLAGS
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/11193da6576d4f38b7a1bb46d129fbf57c53215e...720499ee25605a752e0ce7eb83ea67d7437e3f88
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/11193da6576d4f38b7a1bb46d129fbf57c53215e...720499ee25605a752e0ce7eb83ea67d7437e3f88
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
