From 206a1fca6fc131f51c1551cdc8ad9ca36ea572a9 Mon Sep 17 00:00:00 2001 From: red0124 <75804778+red0124@users.noreply.github.com> Date: Sat, 5 Jul 2025 03:40:49 +0200 Subject: [PATCH] [skip ci] Update MacOS CI image --- .github/workflows/macos-apple-clang.yml | 6 +++--- script/ci_install_deps.sh | 10 +++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/macos-apple-clang.yml b/.github/workflows/macos-apple-clang.yml index 40ae04b..a137624 100644 --- a/.github/workflows/macos-apple-clang.yml +++ b/.github/workflows/macos-apple-clang.yml @@ -25,10 +25,10 @@ jobs: strategy: matrix: - xcode: ['13.4.1', '14.1'] + xcode: ['15.2'] type: [Release, Debug] - runs-on: macos-12 + runs-on: macos-latest env: DEVELOPER_DIR: /Applications/Xcode_${{matrix.xcode}}.app/Contents/Developer @@ -42,7 +42,7 @@ jobs: id: cores - name: Install dependencies - run: script/ci_install_deps.sh + run: script/ci_install_deps.sh sudo - name: Configure run: cmake -S test -B build -DCMAKE_BUILD_TYPE=${{matrix.type}} diff --git a/script/ci_install_deps.sh b/script/ci_install_deps.sh index 6ed958e..e85b3d0 100755 --- a/script/ci_install_deps.sh +++ b/script/ci_install_deps.sh @@ -1,9 +1,9 @@ -#!/bin/bash +#!/usr/bin/env bash JOBS=4 BUILD_TYPE=Debug -set -eux +set -ex git clone https://github.com/red0124/doctest -b master --depth 1 @@ -12,6 +12,10 @@ cmake -S doctest -B doctest/build \ -D DOCTEST_WITH_MAIN_IN_STATIC_LIB=NO \ -D DOCTEST_WITH_TESTS=NO -cmake --build doctest/build --config ${BUILD_TYPE} --target install -j ${JOBS} +if [[ "${1}" == "sudo" ]]; then + sudo cmake --build doctest/build --config ${BUILD_TYPE} --target install -j ${JOBS} +else + cmake --build doctest/build --config ${BUILD_TYPE} --target install -j ${JOBS} +fi rm -rf doctest