diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 450562a52..8b513d94d 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -23,31 +23,31 @@ jobs: matrix: platform: - name: "Linux (clang, OpenSSL)" + id: linux + os: ubuntu-latest + setup-script: ubuntu env: CC: clang CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DREGEX_BACKEND=builtin -DDEPRECATE_HARD=ON -DUSE_GSSAPI=ON -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_CLI=ON -DCMAKE_BUILD_TYPE=Release CMAKE_BUILD_OPTIONS: --config Release - id: linux - os: ubuntu-latest - setup-script: ubuntu - name: "macOS" - os: macos-12 + id: macos + os: macos-latest + setup-script: osx env: CC: clang CMAKE_OPTIONS: -DREGEX_BACKEND=regcomp_l -DDEPRECATE_HARD=ON -DUSE_GSSAPI=ON -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_CLI=ON -DCMAKE_BUILD_TYPE=Release CMAKE_BUILD_OPTIONS: --config Release PKG_CONFIG_PATH: /usr/local/opt/openssl/lib/pkgconfig - id: macos - setup-script: osx - name: "Windows (amd64, Visual Studio)" - os: windows-2019 + id: windows + os: windows-2022 + setup-script: win32 env: ARCH: amd64 - CMAKE_GENERATOR: Visual Studio 16 2019 + CMAKE_GENERATOR: Visual Studio 17 2022 CMAKE_OPTIONS: -A x64 -DDEPRECATE_HARD=ON -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_CLI=ON -DCMAKE_BUILD_TYPE=Release CMAKE_BUILD_OPTIONS: --config Release - id: windows - setup-script: win32 fail-fast: false name: "Benchmark ${{ matrix.platform.name }}" env: ${{ matrix.platform.env }} diff --git a/.github/workflows/experimental.yml b/.github/workflows/experimental.yml index 5bfea2c00..2ab745f18 100644 --- a/.github/workflows/experimental.yml +++ b/.github/workflows/experimental.yml @@ -37,7 +37,7 @@ jobs: CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON -DEXPERIMENTAL_SHA256=ON - name: "macOS (SHA256)" id: macos-sha256 - os: macos-12 + os: macos-13 setup-script: osx env: CC: clang diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a84bfc561..ad1eded47 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -64,7 +64,7 @@ jobs: CMAKE_OPTIONS: -DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=libssh2 - name: "macOS" id: macos - os: macos-12 + os: macos-13 setup-script: osx env: CC: clang @@ -75,11 +75,11 @@ jobs: SKIP_NEGOTIATE_TESTS: true - name: "Windows (amd64, Visual Studio, Schannel)" id: windows-amd64-vs - os: windows-2019 + os: windows-2022 setup-script: win32 env: ARCH: amd64 - CMAKE_GENERATOR: Visual Studio 16 2019 + CMAKE_GENERATOR: Visual Studio 17 2022 CMAKE_OPTIONS: -A x64 -DWIN32_LEAKCHECK=ON -DDEPRECATE_HARD=ON -DUSE_HTTPS=Schannel -DUSE_SSH=ON -DCMAKE_PREFIX_PATH=D:\Temp\libssh2 BUILD_PATH: C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Program Files (x86)\CMake\bin;D:\Temp\libssh2\bin BUILD_TEMP: D:\Temp @@ -87,11 +87,11 @@ jobs: SKIP_NEGOTIATE_TESTS: true - name: "Windows (x86, Visual Studio, WinHTTP)" id: windows-x86-vs - os: windows-2019 + os: windows-2022 setup-script: win32 env: ARCH: x86 - CMAKE_GENERATOR: Visual Studio 16 2019 + CMAKE_GENERATOR: Visual Studio 17 2022 CMAKE_OPTIONS: -A Win32 -DWIN32_LEAKCHECK=ON -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS -DUSE_BUNDLED_ZLIB=ON -DUSE_SSH=ON -DCMAKE_PREFIX_PATH=D:\Temp\libssh2 BUILD_PATH: C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Program Files (x86)\CMake\bin;D:\Temp\libssh2\bin BUILD_TEMP: D:\Temp @@ -99,7 +99,7 @@ jobs: SKIP_NEGOTIATE_TESTS: true - name: "Windows (amd64, mingw, WinHTTP)" id: windows-amd64-mingw - os: windows-2019 + os: windows-2022 setup-script: mingw env: ARCH: amd64 @@ -111,7 +111,7 @@ jobs: SKIP_NEGOTIATE_TESTS: true - name: "Windows (x86, mingw, Schannel)" id: windows-x86-mingw - os: windows-2019 + os: windows-2022 setup-script: mingw env: ARCH: x86 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index a1cdbfdc6..3bed061fd 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -65,7 +65,7 @@ jobs: CMAKE_OPTIONS: -DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=libssh2 - name: "macOS" id: macos - os: macos-12 + os: macos-13 setup-script: osx env: CC: clang @@ -76,7 +76,7 @@ jobs: SKIP_NEGOTIATE_TESTS: true - name: "iOS" id: ios - os: macos-12 + os: macos-13 setup-script: ios env: CC: clang @@ -86,11 +86,11 @@ jobs: SKIP_TESTS: true # Cannot exec iOS app on macOS - name: "Windows (amd64, Visual Studio, Schannel)" id: windows-amd64-vs - os: windows-2019 + os: windows-2022 setup-script: win32 env: ARCH: amd64 - CMAKE_GENERATOR: Visual Studio 16 2019 + CMAKE_GENERATOR: Visual Studio 17 2022 CMAKE_OPTIONS: -A x64 -DWIN32_LEAKCHECK=ON -DDEPRECATE_HARD=ON -DUSE_HTTPS=Schannel -DUSE_SSH=ON -DCMAKE_PREFIX_PATH=D:\Temp\libssh2 BUILD_PATH: C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Program Files (x86)\CMake\bin;D:\Temp\libssh2\bin BUILD_TEMP: D:\Temp @@ -98,11 +98,11 @@ jobs: SKIP_NEGOTIATE_TESTS: true - name: "Windows (x86, Visual Studio, WinHTTP)" id: windows-x86-vs - os: windows-2019 + os: windows-2022 setup-script: win32 env: ARCH: x86 - CMAKE_GENERATOR: Visual Studio 16 2019 + CMAKE_GENERATOR: Visual Studio 17 2022 CMAKE_OPTIONS: -A Win32 -DWIN32_LEAKCHECK=ON -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS -DUSE_BUNDLED_ZLIB=ON -DUSE_SSH=ON -DCMAKE_PREFIX_PATH=D:\Temp\libssh2 BUILD_PATH: C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Program Files (x86)\CMake\bin;D:\Temp\libssh2\bin BUILD_TEMP: D:\Temp @@ -110,7 +110,7 @@ jobs: SKIP_NEGOTIATE_TESTS: true - name: "Windows (amd64, mingw, WinHTTP)" id: windows-amd64-mingw - os: windows-2019 + os: windows-2022 setup-script: mingw env: ARCH: amd64 @@ -122,7 +122,7 @@ jobs: SKIP_NEGOTIATE_TESTS: true - name: "Windows (x86, mingw, Schannel)" id: windows-x86-mingw - os: windows-2019 + os: windows-2022 setup-script: mingw env: ARCH: x86 @@ -324,10 +324,10 @@ jobs: SKIP_NEGOTIATE_TESTS: true - name: "Windows (no mmap)" id: windows-nommap - os: windows-2019 + os: windows-2022 env: ARCH: amd64 - CMAKE_GENERATOR: Visual Studio 16 2019 + CMAKE_GENERATOR: Visual Studio 17 2022 CFLAGS: -DNO_MMAP CMAKE_OPTIONS: -A x64 -DDEPRECATE_HARD=ON SKIP_SSH_TESTS: true @@ -356,7 +356,7 @@ jobs: os: ubuntu-latest - name: "macOS (SHA256)" id: macos-sha256 - os: macos-12 + os: macos-13 setup-script: osx env: CC: clang @@ -366,10 +366,10 @@ jobs: SKIP_NEGOTIATE_TESTS: true - name: "Windows (SHA256, amd64, Visual Studio)" id: windows-sha256 - os: windows-2019 + os: windows-2022 env: ARCH: amd64 - CMAKE_GENERATOR: Visual Studio 16 2019 + CMAKE_GENERATOR: Visual Studio 17 2022 CMAKE_OPTIONS: -A x64 -DWIN32_LEAKCHECK=ON -DDEPRECATE_HARD=ON -DEXPERIMENTAL_SHA256=ON SKIP_SSH_TESTS: true SKIP_NEGOTIATE_TESTS: true diff --git a/ci/setup-ios-build.sh b/ci/setup-ios-build.sh index 94af4e486..623b135cf 100755 --- a/ci/setup-ios-build.sh +++ b/ci/setup-ios-build.sh @@ -3,8 +3,10 @@ set -ex brew update -brew install pkgconfig libssh2 ninja +brew install ninja -ln -s /Applications/Xcode.app/Contents/Developer/usr/lib/libLeaksAtExit.dylib /usr/local/lib +sudo mkdir /usr/local/lib || true +sudo chmod 0755 /usr/local/lib +sudo ln -s /Applications/Xcode.app/Contents/Developer/usr/lib/libLeaksAtExit.dylib /usr/local/lib curl -s -L https://raw.githubusercontent.com/leetal/ios-cmake/master/ios.toolchain.cmake -o ios.toolchain.cmake diff --git a/ci/setup-osx-build.sh b/ci/setup-osx-build.sh index 511d886cb..559890254 100755 --- a/ci/setup-osx-build.sh +++ b/ci/setup-osx-build.sh @@ -3,6 +3,8 @@ set -ex brew update -brew install pkgconfig libssh2 ninja +brew install ninja -ln -s /Applications/Xcode.app/Contents/Developer/usr/lib/libLeaksAtExit.dylib /usr/local/lib +sudo mkdir /usr/local/lib || true +sudo chmod 0755 /usr/local/lib +sudo ln -s /Applications/Xcode.app/Contents/Developer/usr/lib/libLeaksAtExit.dylib /usr/local/lib