From 449168207808b00e5cb1231c2ec8d476fbc751b5 Mon Sep 17 00:00:00 2001
From: David Fuhrmann <dfuhrmann@videolan.org>
Date: Thu, 21 Jan 2021 22:12:32 +0100
Subject: [PATCH] gitlab-ci: Add builders for macOS ARM
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.
All builds are running on the catalina machines.
---
extras/ci/gitlab-ci.yml | 39 +++++++++++++++++++++++++++++++--------
1 file changed, 31 insertions(+), 8 deletions(-)
diff --git a/extras/ci/gitlab-ci.yml b/extras/ci/gitlab-ci.yml
index f82e3629376d..9598ea27e0f8 100644
--- a/extras/ci/gitlab-ci.yml
+++ b/extras/ci/gitlab-ci.yml
@@ -48,12 +48,20 @@ variables:
HOST_ARCH: aarch64
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: 19
+ SHORTARCH: intel64
HOST_ARCH: x86_64
TRIPLET: $HOST_ARCH-apple-darwin$VLC_FORCE_KERNELVERSION
+.variables-macos-arm64: &variables-macos-arm64
+ VLC_PATH: /Users/videolanci/sandbox/bin
+ VLC_FORCE_KERNELVERSION: 19
+ SHORTARCH: arm64
+ HOST_ARCH: aarch64
+ TRIPLET: $HOST_ARCH-apple-darwin$VLC_FORCE_KERNELVERSION
+
.variables-ios-arm64: &variables-ios-arm64
VLC_PATH: /Users/videolanci/sandbox/bin
HOST_ARCH: arm64
@@ -304,7 +312,7 @@ raspbian-arm:
#
# macOS
#
-macos:
+.macos-common:
extends: .base-template
tags:
- amd64
@@ -319,23 +327,38 @@ macos:
EXTRA_BUILD_FLAGS="-c -p"
fi
mkdir build && cd build
- ../extras/package/macosx/build.sh $EXTRA_BUILD_FLAGS $NIGHTLY_EXTRA_BUILD_FLAGS
- variables: *variables-macos
+ ../extras/package/macosx/build.sh $EXTRA_BUILD_FLAGS $NIGHTLY_EXTRA_BUILD_FLAGS -a $HOST_ARCH
+
+macos-x86_64:
+ extends: .macos-common
+ variables: *variables-macos-x86_64
+
+macos-arm64:
+ extends: .macos-common
+ variables: *variables-macos-arm64
-nightly-macos:
- extends: macos
+.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-*.tar.gz nightlies/$(basename build/vlc-*.tar.gz | sed "s/\.tar\.gz/-${CI_COMMIT_SHORT_SHA}\.tar\.gz/")
+ - mv build/vlc-*.dmg nightlies/$(basename build/vlc-*.dmg | sed "s/\.dmg/-${SHORTARCH}-${CI_COMMIT_SHORT_SHA}\.dmg/")
+ - mv build/vlc-*.tar.gz nightlies/$(basename build/vlc-*.tar.gz | sed "s/\.tar\.gz/-${SHORTARCH}-${CI_COMMIT_SHORT_SHA}\.tar\.gz/")
- 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
+ variables: *variables-macos-x86_64
+
+nightly-macos-arm64:
+ extends: .nightly-macos-common
+ variables: *variables-macos-arm64
+
#
# iOS
#
--
GitLab