[skip ci] Update Windows CI images

.github/workflows/macos-apple-clang.yml

@@ -25,10 +25,10 @@ jobs:
 
     strategy:
       matrix:
-        xcode: ['15.2']
+        xcode: ['13.4.1', '14.1']
         type: [Release, Debug]
 
-    runs-on: macos-latest
+    runs-on: macos-12
 
     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 sudo
+        run: script/ci_install_deps.sh
 
       - name: Configure
         run: cmake -S test -B build -DCMAKE_BUILD_TYPE=${{matrix.type}}

.github/workflows/win-msvc.yml

@@ -31,6 +31,9 @@ jobs:
       fail-fast: false
       matrix:
         config:
+          - os: windows-2025
+            vs: "Visual Studio 18 2025"
+
           - os: windows-latest
             vs: "Visual Studio 17 2022"
 

script/ci_install_deps.sh

@@ -1,9 +1,9 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 JOBS=4
 BUILD_TYPE=Debug
 
-set -ex
+set -eux
 
 git clone https://github.com/red0124/doctest -b master --depth 1
 
@@ -12,10 +12,6 @@ cmake -S doctest -B doctest/build \
     -D DOCTEST_WITH_MAIN_IN_STATIC_LIB=NO \
     -D DOCTEST_WITH_TESTS=NO
 
-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