[vlc-commits] [Git][videolan/vlc][master] CI: rework Darwin jobs

[Felix Paul Kühne (@fkuehne)]

Felix Paul Kühne pushed to branch master at VideoLAN / VLC


Commits:
482c5b4a by Felix Paul Kühne at 2024-06-30T04:49:20+00:00
CI: rework Darwin jobs

This updates the ARM64 job for macOS to use the latest SDK (14). The
existing x86_64 job is kept unchanged.

The tvOS job is updated to use tvOS 17.

The iOS ARM64 and x86_64 simulator jobs are updated to iOS 17.

The current iOS 15 armv7 job is kept.

All that is possible by adding a new runner with Xcode 15.4 on macOS
14.5 with a M1 architecture.

- - - - -


1 changed file:

- extras/ci/gitlab-ci.yml


Changes:

=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -503,8 +503,6 @@ raspbian-arm:
     extends:
         - .base-template
         - .ccache-common-apple
-    tags:
-        - monterey
     script: |
         if [ "${CI_JOB_NAME:0:8}" = "nightly-" ]; then
             NIGHTLY_EXTRA_BUILD_FLAGS="-i n"
@@ -527,10 +525,14 @@ raspbian-arm:
 
 macos-x86_64:
     extends: .macos-common
+    tags:
+        - monterey
     variables: *variables-macos-x86_64
 
 macos-arm64:
     extends: .macos-common
+    tags:
+        - macos-xcode15
     variables: *variables-macos-arm64
 
 .nightly-macos-common:
@@ -559,8 +561,6 @@ nightly-macos-arm64:
 #
 .apple-os-common:
     extends: .base-template
-    tags:
-        - monterey
     script: |
         export PATH="${VLC_PATH}:$PATH"
         mkdir build && cd build
@@ -574,18 +574,26 @@ nightly-macos-arm64:
 
 ios-arm64:
     extends: .apple-os-common
+    tags:
+        - macos-xcode15
     variables: *variables-ios-arm64
 
 ios-armv7:
     extends: .apple-os-common
+    tags:
+        - monterey
     variables: *variables-ios-armv7
 
 ios-simulator-x86_64:
     extends: .apple-os-common
+    tags:
+        - macos-xcode15
     variables: *variables-ios-simulator-x86_64
 
 tvos-arm64:
     extends: .apple-os-common
+    tags:
+        - macos-xcode15
     variables: *variables-tvos-arm64
 
 watchos-arm64_32:



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/482c5b4a3e972f5c0f4779ad44caacddca1d01e3

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/482c5b4a3e972f5c0f4779ad44caacddca1d01e3
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance