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

[Konstantin Pavlov]

Hi David!

The patch looks great, however I have a couple minor suggestions (see in-line):

On Thu, Jan 21, 2021 at 10:24:37PM +0100, david.fuhrmann at gmail.com wrote:
> 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

I think it's more consistent to use SHORTARCH instead, just like we do for
win32/win64.

> +        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

Can you please add "- amd64" tag here?  At some point we will build on
arm64 big sur+ machine natively, and it'd be easier to identify the
builders then.

And probably a thought for the future is how to distinguish native vs
cross builds in CI jobs names.  Right now we dont really do, but maybe we
would like to have that for macOS hosts, since it looks like it would be
the first non-amd64 native CI target for VLC, yay!

Have a good weekend!

-- 
VideoLAN, Vice President
www.videolan.org
+7 926 165 45 31
@cryothresh