From ba4812c234a8ed6dc8fcabb8d6c2e26c540a66cc Mon Sep 17 00:00:00 2001
From: Marvin Scholz <epirat07@gmail.com>
Date: Tue, 5 Nov 2019 16:16:28 +0100
Subject: [PATCH] CI: Restructure iOS job for multiple architectures
---
extras/ci/gitlab-ci.yml | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/extras/ci/gitlab-ci.yml b/extras/ci/gitlab-ci.yml
index 3ec6c358f51e..ba0bfa34c37e 100644
--- a/extras/ci/gitlab-ci.yml
+++ b/extras/ci/gitlab-ci.yml
@@ -41,7 +41,7 @@ variables:
HOST_ARCH: x86_64
TRIPLET: $HOST_ARCH-apple-darwin$VLC_FORCE_KERNELVERSION
-.variables-ios: &variables-ios
+.variables-ios-arm64: &variables-ios-arm64
VLC_PATH: /Users/videolanci/sandbox/bin
HOST_ARCH: aarch64
TRIPLET: $HOST_ARCH-apple-iphoneos
@@ -171,19 +171,22 @@ macos:
#
# iOS
#
-ios:
+.ios-common:
extends: .base-template
tags:
- macos
script: |
mkdir build && cd build
if [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then
- ../extras/package/apple/build.sh --sdk=iphoneos --arch=aarch64 \
+ ../extras/package/apple/build.sh --sdk=iphoneos --arch=$HOST_ARCH \
--with-prebuilt-contribs
else
- ../extras/package/apple/build.sh --sdk=iphoneos --arch=aarch64 --package-contribs
+ ../extras/package/apple/build.sh --sdk=iphoneos --arch=$HOST_ARCH --package-contribs
fi
- variables: *variables-ios
+
+ios-arm64:
+ extends: .ios-common
+ variables: *variables-ios-arm64
#
# Android
--
GitLab