From 45c21cd73727ddcd1af843a34dc4ca8648cc872c Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@videolan.org>
Date: Tue, 24 Nov 2020 21:09:01 +0300
Subject: [PATCH] CI: Use catalina builders for macOS/iOS builds
Also specify amd64 for being future-proof when we have Big Sur+
builders.
---
extras/ci/gitlab-ci.yml | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/extras/ci/gitlab-ci.yml b/extras/ci/gitlab-ci.yml
index d42ec06efd23..fdf279dddcea 100644
--- a/extras/ci/gitlab-ci.yml
+++ b/extras/ci/gitlab-ci.yml
@@ -50,7 +50,7 @@ variables:
.variables-macos: &variables-macos
VLC_PATH: /Users/videolanci/sandbox/bin
- VLC_FORCE_KERNELVERSION: 18
+ VLC_FORCE_KERNELVERSION: 19
HOST_ARCH: x86_64
TRIPLET: $HOST_ARCH-apple-darwin$VLC_FORCE_KERNELVERSION
@@ -307,7 +307,8 @@ raspbian-arm:
macos:
extends: .base-template
tags:
- - macos
+ - amd64
+ - catalina
script: |
if [ "${CI_JOB_NAME:0:8}" = "nightly-" ]; then
NIGHTLY_EXTRA_BUILD_FLAGS="-i n"
@@ -344,7 +345,8 @@ nightly-macos:
.apple-os-common:
extends: .base-template
tags:
- - macos
+ - amd64
+ - catalina
script: |
mkdir build && cd build
if [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then
--
GitLab