From fc518220674ca1e5cd193d60d817f4a6182031aa Mon Sep 17 00:00:00 2001 From: derselbst Date: Sat, 3 Aug 2024 10:21:09 +0200 Subject: [PATCH] Update MacPorts CI --- .azure/azure-pipelines-mac.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.azure/azure-pipelines-mac.yml b/.azure/azure-pipelines-mac.yml index bd868ee79..47aadf807 100644 --- a/.azure/azure-pipelines-mac.yml +++ b/.azure/azure-pipelines-mac.yml @@ -26,15 +26,15 @@ jobs: - job: macOS_brew strategy: matrix: - UnixLibs11: + UnixLibs13: imageName: 'macOS-13' CMakeFlags: '-Denable-framework=0' ReadlinePkgConf: '' - UnixLibs11_static: + UnixLibs13_static: imageName: 'macOS-13' CMakeFlags: '-Denable-framework=0 -DBUILD_SHARED_LIBS=0' ReadlinePkgConf: '' - UnixLibs11_static_pkgconf_readline: + UnixLibs13_static_pkgconf_readline: imageName: 'macOS-13' CMakeFlags: '-Denable-framework=0 -DBUILD_SHARED_LIBS=0' ReadlinePkgConf: '$(brew --prefix readline)/lib/pkgconfig' @@ -50,7 +50,7 @@ jobs: imageName: 'macos-12' CMakeFlags: '-Denable-framework=0 -DBUILD_SHARED_LIBS=0' ReadlinePkgConf: '$(brew --prefix readline)/lib/pkgconfig' - FrameWork11: + FrameWork13: imageName: 'macOS-13' CMakeFlags: '' ReadlinePkgConf: '' @@ -137,9 +137,13 @@ jobs: # imageName: 'macos-11' # CMakeFlags: '-Denable-sdl2=0 -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -Denable-framework=0 12_0_universal_unixlibs: - macPortsUrl: 'https://github.com/macports/macports-base/releases/download/v2.7.2/MacPorts-2.7.2-12-Monterey.pkg' + macPortsUrl: 'https://github.com/macports/macports-base/releases/download/v2.9.3/MacPorts-2.9.3-12-Monterey.pkg' imageName: 'macos-12' CMakeFlags: '-Denable-sdl2=0 -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -Denable-framework=0' + 13_0_universal_unixlibs: + macPortsUrl: 'https://github.com/macports/macports-base/releases/download/v2.9.3/MacPorts-2.9.3-13-Ventura.pkg' + imageName: 'macos-13' + CMakeFlags: '-Denable-sdl2=0 -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -Denable-framework=0' pool: vmImage: $(imageName) steps: