Skip to content
Snippets Groups Projects
Commit b8975a20 authored by Alexandre Janniaux's avatar Alexandre Janniaux
Browse files

extras: ci: add SDKNAME for iOS jobs

Generalize iOS jobs by supplying the SDK name as variable.

It is mainly designed so as to have other SDK than iphoneos one, like
iPhone simulator or Apple TV.
parent d6215c46
No related branches found
No related tags found
No related merge requests found
......@@ -54,12 +54,14 @@ variables:
HOST_ARCH: arm64
TRIPLET: $HOST_ARCH-apple-iphoneos
MAKEFLAGS: -j4
SDKNAME: iphoneos
.variables-ios-armv7: &variables-ios-armv7
VLC_PATH: /Users/videolanci/sandbox/bin
HOST_ARCH: armv7
TRIPLET: $HOST_ARCH-apple-iphoneos
MAKEFLAGS: -j4
SDKNAME: iphoneos
.variables-android-arm: &variables-android-arm
ANDROID_ARCH: arm
......@@ -315,25 +317,25 @@ nightly-macos:
#
# iOS
#
.ios-common:
.apple-os-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=$HOST_ARCH \
../extras/package/apple/build.sh --sdk=$SDKNAME --arch=$HOST_ARCH \
--with-prebuilt-contribs
else
../extras/package/apple/build.sh --sdk=iphoneos --arch=$HOST_ARCH --package-contribs
../extras/package/apple/build.sh --sdk=$SDKNAME --arch=$HOST_ARCH --package-contribs
fi
ios-arm64:
extends: .ios-common
extends: .apple-os-common
variables: *variables-ios-arm64
ios-armv7:
extends: .ios-common
extends: .apple-os-common
variables: *variables-ios-armv7
#
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment