[vlc-devel] [3.0 Patch] gitlab-ci: Add builders for macOS ARM

[David Fuhrmann]

Hi,

I successfully tried to execute the non-nightly build jobs here: https://code.videolan.org/dfuhrmann/vlc-3.0/-/pipelines/59973 <https://code.videolan.org/dfuhrmann/vlc-3.0/-/pipelines/59973>

BR. David

> Am 21.01.2021 um 22:24 schrieb david.fuhrmann at gmail.com:
> 
> From: David Fuhrmann <dfuhrmann at videolan.org>
> 
> Restructure scripts into common builders for mac and mac nightly.
> Add dedicated jobs to build for macos-arm64, and rename the
> old macos jobs to macos-x86_64.
> 
> The arm builds are running on the catalina machine, the old builds
> stay on old-macmini.
> ---
> extras/ci/gitlab-ci.yml | 48 +++++++++++++++++++++++++++++++++--------
> 1 file changed, 39 insertions(+), 9 deletions(-)
> 
> diff --git a/extras/ci/gitlab-ci.yml b/extras/ci/gitlab-ci.yml
> index 1eced83cdc..bde77b08b1 100644
> --- a/extras/ci/gitlab-ci.yml
> +++ b/extras/ci/gitlab-ci.yml
> @@ -37,11 +37,20 @@ variables:
>         HOST_ARCH: x86_64
>         TRIPLET: $HOST_ARCH-w64-mingw32
> 
> -.variables-macos: &variables-macos
> +.variables-macos-x86_64: &variables-macos-x86_64
>         VLC_PATH: /Users/videolanci/sandbox/bin
>         VLC_FORCE_KERNELVERSION: 18
>         VLC_SDK_PATH: /Applications/Xcode9.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk
>         HOST_ARCH: x86_64
> +        VLC_ARCH_NAME: intel64
> +        TRIPLET: $HOST_ARCH-apple-darwin$VLC_FORCE_KERNELVERSION
> +
> +.variables-macos-arm64: &variables-macos-arm64
> +        VLC_PATH: /Users/videolanci/sandbox/bin
> +        VLC_FORCE_KERNELVERSION: 19
> +        VLC_SDK_PATH: /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
> +        HOST_ARCH: aarch64
> +        VLC_ARCH_NAME: arm64
>         TRIPLET: $HOST_ARCH-apple-darwin$VLC_FORCE_KERNELVERSION
> 
> .variables-android-arm: &variables-android-arm
> @@ -229,10 +238,8 @@ nightly-snap:
> #
> # macOS
> #
> -macos:
> +.macos-common:
>     extends: .base-template
> -    tags:
> -        - old-macmini
>     script: |
>         if [ "${CI_JOB_NAME:0:8}" = "nightly-" ]; then
>             NIGHTLY_EXTRA_BUILD_FLAGS="-i n"
> @@ -246,22 +253,45 @@ macos:
>             EXTRA_BUILD_FLAGS="-c -p"
>         fi
>         mkdir build && cd build
> -        ../extras/package/macosx/build.sh $EXTRA_BUILD_FLAGS -k $VLC_SDK_PATH $NIGHTLY_EXTRA_BUILD_FLAGS
> -    variables: *variables-macos
> +        ../extras/package/macosx/build.sh $EXTRA_BUILD_FLAGS -a $HOST_ARCH -k $VLC_SDK_PATH $NIGHTLY_EXTRA_BUILD_FLAGS
> +
> +macos-x86_64:
> +    extends: .macos-common
> +    tags:
> +        - old-macmini
> +    variables: *variables-macos-x86_64
> 
> -nightly-macos:
> -    extends: macos
> +macos-arm64:
> +    extends: .macos-common
> +    tags:
> +        - catalina
> +    variables: *variables-macos-arm64
> +
> +.nightly-macos-common:
> +    extends: .macos-common
>     only:
>         - schedules
>     except:
>     after_script:
>         - mkdir nightlies
> -        - mv build/vlc-*.dmg nightlies/$(basename build/vlc-*.dmg | sed "s/\.dmg/-${CI_COMMIT_SHORT_SHA}\.dmg/")
> +        - mv build/vlc-*.dmg nightlies/$(basename build/vlc-*.dmg | sed "s/\.dmg/-${VLC_ARCH_NAME}-${CI_COMMIT_SHORT_SHA}\.dmg/")
>         - cd nightlies && find . -maxdepth 1 -type f -not -name SHA512SUM | xargs shasum -a 512 | tee SHA512SUM
>     artifacts:
>         paths:
>             - nightlies/*
> 
> +nightly-macos-x86_64:
> +    extends: .nightly-macos-common
> +    tags:
> +        - old-macmini
> +    variables: *variables-macos-x86_64
> +
> +nightly-macos-arm64:
> +    extends: .nightly-macos-common
> +    tags:
> +        - catalina
> +    variables: *variables-macos-arm64
> +
> #
> # Android
> #
> -- 
> 2.21.1 (Apple Git-122.3)
> 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20210121/714357cb/attachment.html>