[vlc-commits] extras: ci: add SDKNAME for iOS jobs

[Alexandre Janniaux]

vlc | branch: master | Alexandre Janniaux <ajanni at videolabs.io> | Mon Jul 13 13:23:55 2020 +0200| [b8975a202818295ed547c201b2ecc8e9c0bff067] | committer: Alexandre Janniaux

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.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b8975a202818295ed547c201b2ecc8e9c0bff067
---

 extras/ci/gitlab-ci.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/extras/ci/gitlab-ci.yml b/extras/ci/gitlab-ci.yml
index 61116fc26b..974504e2b3 100644
--- a/extras/ci/gitlab-ci.yml
+++ b/extras/ci/gitlab-ci.yml
@@ -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
 
 #