From 496662bdfe58a6bac626db45fa21246899431201 Mon Sep 17 00:00:00 2001 From: Peio Rigaux Date: Tue, 26 Aug 2025 12:11:24 +0200 Subject: [PATCH] Test Xcode 16 build for mac --- .gitlab-ci-files/macosx-desktop.yml | 10 +++++----- .gitlab-ci.yml | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci-files/macosx-desktop.yml b/.gitlab-ci-files/macosx-desktop.yml index 206faf15d..362296b94 100644 --- a/.gitlab-ci-files/macosx-desktop.yml +++ b/.gitlab-ci-files/macosx-desktop.yml @@ -26,7 +26,7 @@ .macosx-desktop: stage: build - tags: [ "macos-min-xcode12.2" ] + tags: [ "macmini-m1-3-xcode16" ] rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $DOCKER_UPDATE == null && $SKIP_MACOSX == null - if: $CI_PIPELINE_SOURCE == "schedule" && $DOCKER_UPDATE == null && $SKIP_MACOSX == null @@ -93,7 +93,7 @@ macosx-ninja-novideo: # WAIT for QT6 for arm64 macosx-ninja-package: stage: package - tags: [ "macos-min-xcode12.2" ] + tags: [ "macmini-m1-3-xcode16" ] dependencies: [] rules: - !reference [.rules-merge-request-manual, rules] @@ -117,7 +117,7 @@ macosx-ninja-package: macosx-codesigning: stage: signing - tags: [ "macos-min-xcode12.2" ] + tags: [ "macmini-m1-3-xcode16" ] needs: - macosx-ninja-package rules: @@ -142,7 +142,7 @@ macosx-codesigning: macosx-deploy: stage: deploy - tags: [ "macos-min-xcode12.2" ] + tags: [ "macmini-m1-3-xcode16" ] needs: - macosx-codesigning only: @@ -160,7 +160,7 @@ macosx-deploy: macosx-makefile-plugins-deploy: stage: deploy - tags: [ "macos-min-xcode12.2" ] + tags: [ "macmini-m1-3-xcode16" ] needs: - macosx-makefile only: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ce833505d..a741d75a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,10 +50,10 @@ workflow: include: - '.gitlab-ci-files/rules.yml' - '.gitlab-ci-files/linux-prepare.yml' - - '.gitlab-ci-files/linux-desktop.yml' + # - '.gitlab-ci-files/linux-desktop.yml' # - '.gitlab-ci-files/linux-desktop-ubuntu-2004.yml' - - '.gitlab-ci-files/linux-desktop-ubuntu-2204.yml' - - '.gitlab-ci-files/windows-desktop.yml' + # - '.gitlab-ci-files/linux-desktop-ubuntu-2204.yml' + # - '.gitlab-ci-files/windows-desktop.yml' - '.gitlab-ci-files/macosx-desktop.yml'