[skip ci] Update MacOS CI image

.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}}

.github/workflows/ubuntu-latest-icc.yml

@@ -1,77 +0,0 @@
-name: ubuntu-latest-icc-ci
-
-on:
-  workflow_dispatch:
-
-  push:
-    branches:
-      - master
-      - feature/**
-      - improvement/**
-      - bugfix/**
-
-  pull_request:
-    branches:
-      - master
-      - feature/**
-      - improvement/**
-      - bugfix/**
-
-env:
-  LINUX_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17431/l_BaseKit_p_2021.1.0.2659_offline.sh
-  LINUX_HPCKIT_URL:
-    https://registrationcenter-download.intel.com/akdlm/irc_nas/17427/l_HPCKit_p_2021.1.0.2684_offline.sh
-
-jobs:
-  icc_tests:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-
-    runs-on: ubuntu-latest
-
-    defaults:
-      run:
-        shell: bash
-
-    container:
-      image: gcc:10
-      options: -v /usr/local:/host_usr_local
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: cache install
-        id: cache-install
-        uses: actions/cache@v2
-        with:
-          path: |
-            /opt/intel/oneapi/compiler
-          key: >-
-            install-${{env.LINUX_HPCKIT_URL}}-
-            ${{env.LINUX_CPP_COMPONENTS_WEB}}-
-            compiler-${{hashFiles('**/scripts/cache_exclude_linux.sh')}}
-
-      - name: Install icc
-        run: >-
-          script/ci_install_icc.sh $LINUX_HPCKIT_URL $LINUX_CPP_COMPONENTS_WEB
-
-      - name: CMake
-        run: echo "/host_usr_local/bin" >> $GITHUB_PATH
-
-      - name: Install dependencies
-        run: script/ci_install_deps.sh
-
-      - name: Configure
-        run: >-
-          source script/ci_setup_icc.sh &&
-          cmake -S test -B build -D CMAKE_BUILD_TYPE=Debug
-
-      - name: Build
-        run: >-
-          source script/ci_setup_icc.sh &&
-          cmake --build build -j ${{steps.cores.outputs.count}}
-
-      - name: Run
-        working-directory: build
-        run: ctest --output-on-failure

.github/workflows/win-msvc.yml

@@ -31,14 +31,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - os: windows-2019
-            vs: "Visual Studio 16 2019"
-
           - os: windows-latest
             vs: "Visual Studio 17 2022"
 
         build: [Debug, Release]
-        platform: [Win32, x64]
+        platform: [x64]
 
     runs-on: ${{matrix.config.os}}
 

.github/workflows/win-msys2-clang.yml

@@ -31,7 +31,7 @@ jobs:
       fail-fast: false
 
       matrix:
-        os: [windows-2019, windows-latest]
+        os: [windows-2025, windows-latest]
         type: [Release, Debug]
         config:
           - msystem: "MINGW64"
@@ -39,11 +39,6 @@ jobs:
               git mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja
               mingw-w64-x86_64-clang
 
-          - msystem: "MINGW32"
-            install: >-
-              git mingw-w64-i686-cmake mingw-w64-i686-ninja
-              mingw-w64-i686-clang
-
     runs-on: ${{matrix.os}}
 
     name: "${{matrix.config.msystem}}: ${{matrix.os}}: ${{matrix.type}}"

.github/workflows/win-msys2-gcc.yml

@@ -31,7 +31,7 @@ jobs:
       fail-fast: false
 
       matrix:
-        os: [windows-2019, windows-latest]
+        os: [windows-2025, windows-latest]
         type: [Release, Debug]
         config:
           - msystem: "MINGW64"
@@ -39,11 +39,6 @@ jobs:
               git mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja
               mingw-w64-x86_64-gcc
 
-          - msystem: "MINGW32"
-            install: >-
-              git mingw-w64-i686-cmake mingw-w64-i686-ninja
-              mingw-w64-i686-gcc
-
     runs-on: ${{matrix.os}}
 
     name: "${{matrix.config.msystem}}: ${{matrix.os}}: ${{matrix.type}}"

README.md

@@ -13,7 +13,6 @@
 [![single-header](https://github.com/red0124/ssp/workflows/single-header-ci/badge.svg)](https://github.com/red0124/ssp/actions/workflows/single-header.yml)
 [![ubuntu-latest-gcc](https://github.com/red0124/ssp/workflows/ubuntu-latest-gcc-ci/badge.svg)](https://github.com/red0124/ssp/actions/workflows/ubuntu-latest-gcc.yml)
 [![ubuntu-latest-clang](https://github.com/red0124/ssp/workflows/ubuntu-latest-clang-ci/badge.svg)](https://github.com/red0124/ssp/actions/workflows/ubuntu-latest-clang.yml)
-[![ubuntu-latest-icc](https://github.com/red0124/ssp/workflows/ubuntu-latest-icc-ci/badge.svg)](https://github.com/red0124/ssp/actions/workflows/ubuntu-latest-icc.yml)
 [![windows-msys2-gcc](https://github.com/red0124/ssp/workflows/win-msys2-gcc-ci/badge.svg)](https://github.com/red0124/ssp/actions/workflows/win-msys2-gcc.yml)
 [![windows-msys2-clang](https://github.com/red0124/ssp/workflows/win-msys2-clang-ci/badge.svg)](https://github.com/red0124/ssp/actions/workflows/win-msys2-clang.yml)
 [![windows-msvc](https://github.com/red0124/ssp/workflows/win-msvc-ci/badge.svg)](https://github.com/red0124/ssp/actions/workflows/win-msvc.yml)

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