diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml index 9626c23..c29b7de 100644 --- a/ci/azure-pipelines.yml +++ b/ci/azure-pipelines.yml @@ -46,7 +46,7 @@ jobs: timeoutInMinutes: 180 dependsOn: Source variables: - IMAGE_NAME: 'macOS-13' + IMAGE_NAME: 'macOS-14' MACOSX_DEPLOYMENT_TARGET: 11.7 SUPERBUILD_INSTALL_DIR: $(HOME)/superbuild QT_STYLE_OVERRIDE: fusion @@ -119,7 +119,7 @@ jobs: timeoutInMinutes: 180 dependsOn: Android_aarch64 variables: - IMAGE_NAME: 'macOS-13' + IMAGE_NAME: 'macOS-14' SUPERBUILD_INSTALL_DIR: $(HOME)/superbuild TARGET: armv7a-linux-androideabi TARGET_SUFFIX: -$(TARGET) @@ -149,7 +149,7 @@ jobs: timeoutInMinutes: 180 dependsOn: Source variables: - IMAGE_NAME: 'macOS-13' + IMAGE_NAME: 'macOS-14' SUPERBUILD_INSTALL_DIR: $(HOME)/superbuild TARGET: aarch64-linux-android TARGET_SUFFIX: -$(TARGET) @@ -179,7 +179,7 @@ jobs: timeoutInMinutes: 180 dependsOn: Source variables: - IMAGE_NAME: 'macOS-13' + IMAGE_NAME: 'macOS-14' SUPERBUILD_INSTALL_DIR: $(HOME)/superbuild TARGET: i686-linux-android TARGET_SUFFIX: -$(TARGET) @@ -209,7 +209,7 @@ jobs: timeoutInMinutes: 180 dependsOn: Android_x86 variables: - IMAGE_NAME: 'macOS-13' + IMAGE_NAME: 'macOS-14' SUPERBUILD_INSTALL_DIR: $(HOME)/superbuild TARGET: x86_64-linux-android TARGET_SUFFIX: -$(TARGET) diff --git a/ci/setup-macos.yml b/ci/setup-macos.yml index c116d37..84bd90f 100644 --- a/ci/setup-macos.yml +++ b/ci/setup-macos.yml @@ -1,6 +1,6 @@ # This file is part of OpenOrienteering. -# Copyright 2019, 2024 Kai Pastor +# Copyright 2019, 2024, 2025 Kai Pastor # # Redistribution and use is allowed according to the terms of the BSD license: # @@ -36,7 +36,7 @@ steps: brew install texinfo - sudo xcode-select -s /Applications/Xcode_14.1.app/Contents/Developer + sudo xcode-select -s /Applications/Xcode_15.0.app/Contents/Developer xcode-select --print-path # - We target android-28 at the moment.