Update CI (#565)

cpp-pm · May 27, 2022 · f4de16c · f4de16c
1 parent 8f99a14
commit f4de16c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 22 deletions.
diff --git a/.github/workflows/ci/build.cmd b/.github/workflows/ci/build.cmd
@@ -33,18 +33,12 @@ set MINGW_PATH=C:\ProgramData\chocolatey\bin
 :: MSYS2 location
 set MSYS_PATH=C:\msys64\usr\bin
 
-:: Visual Studio 15 2017: Mimic behavior of older versions
-set VS150COMNTOOLS=C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Tools
-
 :: Visual Studio 16 2019: Mimic behavior of older versions
 set VS160COMNTOOLS=C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools
 
 :: To fix "path too long" error
 if not "%TOOLCHAIN:vs-=%"=="%TOOLCHAIN%" set HUNTER_BINARY_DIR=C:\__BIN
 
-:: Add msbuild to PATH (for vs-14 toolchain, GitHub windows-2016 runner doesn't have VS 2015)
-if "%TOOLCHAIN:~0,5%"=="vs-14" set PATH=C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin;%PATH%
-
 set "UPLOAD="
 if "%BRANCH_NAME%" == "master" if not "%GITHUB_USER_PASSWORD%" == "" (
     set UPLOAD=--upload

diff --git a/.github/workflows/ci/build.sh b/.github/workflows/ci/build.sh
@@ -24,14 +24,9 @@ export ANDROID_NDK_r15c="`pwd`/_ci/android-ndk-r15c"
 export ANDROID_NDK_r16b="`pwd`/_ci/android-ndk-r16b"
 export ANDROID_NDK_r17="`pwd`/_ci/android-ndk-r17"
 
-# Use Xcode 11.3.1 instead of default 11.6 (for ios-13-2 toolchain, no iOS 13.2 SDK in Xcode 11.6)
-if [[ "$TOOLCHAIN" =~ "ios-nocodesign-13-2" ]]; then
-    export DEVELOPER_DIR="/Applications/Xcode_11.3.1.app/Contents/Developer"
-fi
-
-# Use Xcode 12.2 instead of default 12.4 (no macOS 11.0 SDK in Xcode 12.4)
-if [[ "$TOOLCHAIN" =~ "osx-11-0" ]]; then
-    export DEVELOPER_DIR="/Applications/Xcode_12.2.app/Contents/Developer"
+# Use Xcode 13.4 for macOS 12.x and iOS 15.x toolchains
+if [[ "$TOOLCHAIN" =~ "osx-12" || "$TOOLCHAIN" =~ "ios-nocodesign-15" ]]; then
+    export DEVELOPER_DIR="/Applications/Xcode_13.4.app/Contents/Developer"
 fi
 
 # Run build script

diff --git a/.github/workflows/ci/matrix.json b/.github/workflows/ci/matrix.json
@@ -9,13 +9,11 @@
 { "example": "foo", "toolchain": "sanitize-leak-cxx17",                             "os": "ubuntu-20.04", "python": "3.8", "script": "build.sh"  },
 { "example": "foo", "toolchain": "sanitize-thread-cxx17",                           "os": "ubuntu-20.04", "python": "3.8", "script": "build.sh"  },
 { "example": "foo", "toolchain": "osx-10-15-make-cxx14",                            "os": "macos-10.15",  "python": "3.8", "script": "build.sh"  },
-{ "example": "foo", "toolchain": "osx-11-1-arch-universal2-cxx17",                  "os": "macos-10.15",  "python": "3.8", "script": "build.sh"  },
-{ "example": "foo", "toolchain": "ios-nocodesign-14-4-dep-10-0-arm64",              "os": "macos-10.15",  "python": "3.8", "script": "build.sh"  },
-{ "example": "foo", "toolchain": "ninja-vs-15-2017-win64-cxx17",                    "os": "windows-2016", "python": "3.8", "script": "build.cmd" },
-{ "example": "foo", "toolchain": "nmake-vs-15-2017-win64-cxx17",                    "os": "windows-2016", "python": "3.8", "script": "build.cmd" },
+{ "example": "foo", "toolchain": "osx-12-3-arch-universal2-cxx17",                  "os": "macos-12",     "python": "3.8", "script": "build.sh"  },
+{ "example": "foo", "toolchain": "ios-nocodesign-15-5-arm64-cxx17",                 "os": "macos-12",     "python": "3.8", "script": "build.sh"  },
+{ "example": "foo", "toolchain": "ninja-vs-16-2019-win64-cxx17",                    "os": "windows-2019", "python": "3.8", "script": "build.cmd" },
+{ "example": "foo", "toolchain": "nmake-vs-16-2019-win64-cxx17",                    "os": "windows-2019", "python": "3.8", "script": "build.cmd" },
 { "example": "foo", "toolchain": "vs-16-2019-win64-sdk-10-0-18362-0-cxx17",         "os": "windows-2019", "python": "3.8", "script": "build.cmd" },
-{ "example": "foo", "toolchain": "vs-15-2017-win64-cxx17",                          "os": "windows-2016", "python": "3.8", "script": "build.cmd" },
-{ "example": "foo", "toolchain": "vs-14-2015-sdk-8-1",                              "os": "windows-2016", "python": "3.8", "script": "build.cmd" },
-{ "example": "foo", "toolchain": "mingw-cxx17",                                     "os": "windows-2016", "python": "3.8", "script": "build.cmd" },
-{ "example": "foo", "toolchain": "msys-cxx17",                                      "os": "windows-2016", "python": "3.8", "script": "build.cmd" }
+{ "example": "foo", "toolchain": "mingw-cxx17",                                     "os": "windows-2019", "python": "3.8", "script": "build.cmd" },
+{ "example": "foo", "toolchain": "msys-cxx17",                                      "os": "windows-2019", "python": "3.8", "script": "build.cmd" }
 ]