From 4e4dde1ab88f1228082ee91646bc8dcd1c424590 Mon Sep 17 00:00:00 2001 From: jmd Date: Thu, 9 Nov 2023 22:32:49 -0800 Subject: [PATCH] [ci] bump macos deployment target --- .github/workflows/ci.yml | 10 +++++----- CMakePresets.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa392d24c..23c1a54b5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ env: VCPKG_DEFAULT_BINARY_CACHE: "${{ github.workspace }}/vcpkg/.cache" NWN_ROOT: "${{ github.workspace }}/nwn/" CI_GITHUB_ACTIONS: "1" - MACOSX_DEPLOYMENT_TARGET: "11" + MACOSX_DEPLOYMENT_TARGET: "12" CMAKE_TOOLCHAIN_FILE: "${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake" jobs: @@ -32,7 +32,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-11, ubuntu-20.04, windows-latest] + os: [macos-12, ubuntu-20.04, windows-latest] runs-on: ${{ matrix.os }} name: Build ${{ matrix.os }} @@ -55,7 +55,7 @@ jobs: # macOS Dependencies - name: macOS - install non-vcpkg dependencies - if: matrix.os == 'macos-11' + if: matrix.os == 'macos-12' env: HOMEBREW_NO_ANALYTICS: "ON" HOMEBREW_NO_AUTO_UPDATE: "ON" @@ -67,7 +67,7 @@ jobs: echo "CXX=$(brew --prefix llvm)/bin/clang++" >> $GITHUB_ENV - name: macOS - check clang version - if: matrix.os == 'macos-11' + if: matrix.os == 'macos-12' run: $CC --version # Linux dependencies @@ -179,7 +179,7 @@ jobs: cmake --preset ci-windows - name: macOS - configure - if: matrix.os == 'macos-11' + if: matrix.os == 'macos-12' run: | cmake --preset ci-macos diff --git a/CMakePresets.json b/CMakePresets.json index 16cee7f97..3b85f66e6 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -171,7 +171,7 @@ "rhs": "Darwin" }, "cacheVariables": { - "CMAKE_OSX_DEPLOYMENT_TARGET": "11" + "CMAKE_OSX_DEPLOYMENT_TARGET": "12" } }, {