[vlc-devel] [PATCH 2/2] CI: add a Raspbian target
Konstantin Pavlov
thresh at videolan.org
Fri Mar 20 11:17:49 CET 2020
Hi Steve,
Hope all is good!
On Fri, Mar 20, 2020 at 10:26:31AM +0100, Steve Lhomme wrote:
> ---
> extras/ci/gitlab-ci.yml | 21 +++++++++++++++++++++
> 1 file changed, 21 insertions(+)
>
> diff --git a/extras/ci/gitlab-ci.yml b/extras/ci/gitlab-ci.yml
> index 47e6c569a9f..3d8a2a0d68d 100644
> --- a/extras/ci/gitlab-ci.yml
> +++ b/extras/ci/gitlab-ci.yml
> @@ -18,6 +18,7 @@ variables:
> VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20191023134128
> VLC_ANDROID_IMAGE: registry.videolan.org/vlc-debian-android:20190717134531
> VLC_SNAP_IMAGE: registry.videolan.org/vlc-ubuntu-bionic:20190627090437
> + VLC_RASPBIAN_IMAGE: registry.videolan.org/vlc-debian-raspbian:20200213203125
>
> .variables-debian: &variables-debian
> HOST_ARCH: x86_64
> @@ -68,6 +69,10 @@ variables:
> ANDROID_ARCH: x86_64
> TRIPLET: x86_64-linux-android
>
> +.variables-raspbian-arm: &variables-debian
Should be &variables-raspbian-arm here and maybe move higher to be in a
logical group of linux builds.
> + HOST_ARCH: arm
> + TRIPLET: $HOST_ARCH-linux-gnueabihf
> +
> # Common rules
> .base-template:
> stage: build
> @@ -168,6 +173,22 @@ snap:
> - mv extras/package/snap/parts/vlc/build/contrib/vlc-contrib-*.tar.bz2 contrib/vlc-contrib-${TRIPLET}-${VLC_CONTRIB_SHA}.tar.bz2 2>/dev/null || true
> variables: *variables-snap
>
> +#
> +# Debian
Raspbian
> +#
> +raspbian:
> + extends: .docker-template
> + image:
> + name: $VLC_RASPBIAN_IMAGE
> + script: |
> + if [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then
> + echo "Building using prebuilt contribs at $VLC_PREBUILT_CONTRIBS_URL"
> + extras/package/raspberry/build.sh -p -x -a $HOST_ARCH
> + else
> + extras/package/raspberry/build.sh -c -x -a $HOST_ARCH
> + fi
> + variables: *variables-raspbian
And *variables-rasbian-arm here.
BTW there is a good tool to check CI syntax correctness on
https://code.videolan.org/videolan/vlc/-/ci/lint
Thanks!
--
VideoLAN, Vice President
www.videolan.org
+7 926 165 45 31
@cryothresh
More information about the vlc-devel
mailing list