Merge branch 'main' of https://github.com/TheNumbat/rpp

TheNumbat · Jun 13, 2024 · 4437c26 · 4437c26
2 parents 1bbf684 + 5dbebfa
commit 4437c26
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/macos-arm64.yml b/.github/workflows/macos-arm64.yml
@@ -8,7 +8,7 @@ on:
   pull_request:
 jobs:
   build:
-    runs-on: macos-14
+    runs-on: macos-latest
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -17,8 +17,8 @@ jobs:
     - name: Configure
       run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DRPP_TEST=ON
       env:
-        CXX: /opt/homebrew/opt/llvm/bin/clang++
+        CXX: /opt/homebrew/opt/llvm@17/bin/clang++
     - name: Build
       run: cmake --build build -- -j
     - name: Test
-      run: ctest --test-dir build --output-on-failure
+      run: ctest --test-dir build --output-on-failure
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -8,7 +8,7 @@ on:
   pull_request:
 jobs:
   build:
-    runs-on: macos-latest
+    runs-on: macos-13
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -17,8 +17,8 @@ jobs:
     - name: Configure
       run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DRPP_TEST=ON
       env:
-        CXX: /usr/local/opt/llvm/bin/clang++
+        CXX: /usr/local/opt/llvm@17/bin/clang++
     - name: Build
       run: cmake --build build -- -j
     - name: Test
-      run: ctest --test-dir build --output-on-failure
+      run: ctest --test-dir build --output-on-failure
diff --git a/rpp/CMakeLists.txt b/rpp/CMakeLists.txt
@@ -87,8 +87,8 @@ if(WIN32)
 endif()
 
 if(MSVC)
-    if(MSVC_VERSION LESS 1937)
-        message(FATAL_ERROR "Unsupported MSVC version: only 19.37+ is supported.")
+    if(MSVC_VERSION LESS 1939)
+        message(FATAL_ERROR "Unsupported MSVC version: only 19.39+ is supported.")
     endif()
 
     string(REPLACE "/GR" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})