Ything-RepoMirrors/libgit2
2
0
Fork 0
mirror of https://github.com/libgit2/libgit2.git synced 2026-01-25 02:56:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: update to (mostly) latest images

Browse Source 
Update to the latest CI images, except macOS - where there's a memory
leak in macos-14.
This commit is contained in:
Edward Thomson
2024-09-27 12:44:28 +02:00
parent d50b501e7e
commit 12eecf0abc
6 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
.github/workflows/benchmark.yml vendored
View File

@@ -23,31 +23,31 @@ jobs:
matrix: matrix:
platform: platform:
- name: "Linux (clang, OpenSSL)" - name: "Linux (clang, OpenSSL)"
id: linux
os: ubuntu-latest
setup-script: ubuntu
env: env:
CC: clang 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_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 CMAKE_BUILD_OPTIONS: --config Release
id: linux
os: ubuntu-latest
setup-script: ubuntu
- name: "macOS" - name: "macOS"
os: macos-12 id: macos
os: macos-latest
setup-script: osx
env: env:
CC: clang 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_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 CMAKE_BUILD_OPTIONS: --config Release
PKG_CONFIG_PATH: /usr/local/opt/openssl/lib/pkgconfig PKG_CONFIG_PATH: /usr/local/opt/openssl/lib/pkgconfig
id: macos
setup-script: osx
- name: "Windows (amd64, Visual Studio)" - name: "Windows (amd64, Visual Studio)"
os: windows-2019 id: windows
os: windows-2022
setup-script: win32
env: env:
ARCH: amd64 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_OPTIONS: -A x64 -DDEPRECATE_HARD=ON -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_CLI=ON -DCMAKE_BUILD_TYPE=Release
CMAKE_BUILD_OPTIONS: --config Release CMAKE_BUILD_OPTIONS: --config Release
id: windows
setup-script: win32
fail-fast: false fail-fast: false
name: "Benchmark ${{ matrix.platform.name }}" name: "Benchmark ${{ matrix.platform.name }}"
env: ${{ matrix.platform.env }} env: ${{ matrix.platform.env }}

2
.github/workflows/experimental.yml vendored
View File

@@ -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 CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON -DEXPERIMENTAL_SHA256=ON
- name: "macOS (SHA256)" - name: "macOS (SHA256)"
id: macos-sha256 id: macos-sha256
os: macos-12 os: macos-13
setup-script: osx setup-script: osx
env: env:
CC: clang CC: clang

14
.github/workflows/main.yml vendored
View File

@@ -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 CMAKE_OPTIONS: -DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=libssh2
- name: "macOS" - name: "macOS"
id: macos id: macos
os: macos-12 os: macos-13
setup-script: osx setup-script: osx
env: env:
CC: clang CC: clang
@@ -75,11 +75,11 @@ jobs:
SKIP_NEGOTIATE_TESTS: true SKIP_NEGOTIATE_TESTS: true
- name: "Windows (amd64, Visual Studio, Schannel)" - name: "Windows (amd64, Visual Studio, Schannel)"
id: windows-amd64-vs id: windows-amd64-vs
os: windows-2019 os: windows-2022
setup-script: win32 setup-script: win32
env: env:
ARCH: amd64 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 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_PATH: C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Program Files (x86)\CMake\bin;D:\Temp\libssh2\bin
BUILD_TEMP: D:\Temp BUILD_TEMP: D:\Temp
@@ -87,11 +87,11 @@ jobs:
SKIP_NEGOTIATE_TESTS: true SKIP_NEGOTIATE_TESTS: true
- name: "Windows (x86, Visual Studio, WinHTTP)" - name: "Windows (x86, Visual Studio, WinHTTP)"
id: windows-x86-vs id: windows-x86-vs
os: windows-2019 os: windows-2022
setup-script: win32 setup-script: win32
env: env:
ARCH: x86 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 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_PATH: C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Program Files (x86)\CMake\bin;D:\Temp\libssh2\bin
BUILD_TEMP: D:\Temp BUILD_TEMP: D:\Temp
@@ -99,7 +99,7 @@ jobs:
SKIP_NEGOTIATE_TESTS: true SKIP_NEGOTIATE_TESTS: true
- name: "Windows (amd64, mingw, WinHTTP)" - name: "Windows (amd64, mingw, WinHTTP)"
id: windows-amd64-mingw id: windows-amd64-mingw
os: windows-2019 os: windows-2022
setup-script: mingw setup-script: mingw
env: env:
ARCH: amd64 ARCH: amd64
@@ -111,7 +111,7 @@ jobs:
SKIP_NEGOTIATE_TESTS: true SKIP_NEGOTIATE_TESTS: true
- name: "Windows (x86, mingw, Schannel)" - name: "Windows (x86, mingw, Schannel)"
id: windows-x86-mingw id: windows-x86-mingw
os: windows-2019 os: windows-2022
setup-script: mingw setup-script: mingw
env: env:
ARCH: x86 ARCH: x86

26
.github/workflows/nightly.yml vendored
View File

@@ -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 CMAKE_OPTIONS: -DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=libssh2
- name: "macOS" - name: "macOS"
id: macos id: macos
os: macos-12 os: macos-13
setup-script: osx setup-script: osx
env: env:
CC: clang CC: clang
@@ -76,7 +76,7 @@ jobs:
SKIP_NEGOTIATE_TESTS: true SKIP_NEGOTIATE_TESTS: true
- name: "iOS" - name: "iOS"
id: ios id: ios
os: macos-12 os: macos-13
setup-script: ios setup-script: ios
env: env:
CC: clang CC: clang
@@ -86,11 +86,11 @@ jobs:
SKIP_TESTS: true # Cannot exec iOS app on macOS SKIP_TESTS: true # Cannot exec iOS app on macOS
- name: "Windows (amd64, Visual Studio, Schannel)" - name: "Windows (amd64, Visual Studio, Schannel)"
id: windows-amd64-vs id: windows-amd64-vs
os: windows-2019 os: windows-2022
setup-script: win32 setup-script: win32
env: env:
ARCH: amd64 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 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_PATH: C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Program Files (x86)\CMake\bin;D:\Temp\libssh2\bin
BUILD_TEMP: D:\Temp BUILD_TEMP: D:\Temp
@@ -98,11 +98,11 @@ jobs:
SKIP_NEGOTIATE_TESTS: true SKIP_NEGOTIATE_TESTS: true
- name: "Windows (x86, Visual Studio, WinHTTP)" - name: "Windows (x86, Visual Studio, WinHTTP)"
id: windows-x86-vs id: windows-x86-vs
os: windows-2019 os: windows-2022
setup-script: win32 setup-script: win32
env: env:
ARCH: x86 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 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_PATH: C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Program Files (x86)\CMake\bin;D:\Temp\libssh2\bin
BUILD_TEMP: D:\Temp BUILD_TEMP: D:\Temp
@@ -110,7 +110,7 @@ jobs:
SKIP_NEGOTIATE_TESTS: true SKIP_NEGOTIATE_TESTS: true
- name: "Windows (amd64, mingw, WinHTTP)" - name: "Windows (amd64, mingw, WinHTTP)"
id: windows-amd64-mingw id: windows-amd64-mingw
os: windows-2019 os: windows-2022
setup-script: mingw setup-script: mingw
env: env:
ARCH: amd64 ARCH: amd64
@@ -122,7 +122,7 @@ jobs:
SKIP_NEGOTIATE_TESTS: true SKIP_NEGOTIATE_TESTS: true
- name: "Windows (x86, mingw, Schannel)" - name: "Windows (x86, mingw, Schannel)"
id: windows-x86-mingw id: windows-x86-mingw
os: windows-2019 os: windows-2022
setup-script: mingw setup-script: mingw
env: env:
ARCH: x86 ARCH: x86
@@ -324,10 +324,10 @@ jobs:
SKIP_NEGOTIATE_TESTS: true SKIP_NEGOTIATE_TESTS: true
- name: "Windows (no mmap)" - name: "Windows (no mmap)"
id: windows-nommap id: windows-nommap
os: windows-2019 os: windows-2022
env: env:
ARCH: amd64 ARCH: amd64
CMAKE_GENERATOR: Visual Studio 16 2019 CMAKE_GENERATOR: Visual Studio 17 2022
CFLAGS: -DNO_MMAP CFLAGS: -DNO_MMAP
CMAKE_OPTIONS: -A x64 -DDEPRECATE_HARD=ON CMAKE_OPTIONS: -A x64 -DDEPRECATE_HARD=ON
SKIP_SSH_TESTS: true SKIP_SSH_TESTS: true
@@ -356,7 +356,7 @@ jobs:
os: ubuntu-latest os: ubuntu-latest
- name: "macOS (SHA256)" - name: "macOS (SHA256)"
id: macos-sha256 id: macos-sha256
os: macos-12 os: macos-13
setup-script: osx setup-script: osx
env: env:
CC: clang CC: clang
@@ -366,10 +366,10 @@ jobs:
SKIP_NEGOTIATE_TESTS: true SKIP_NEGOTIATE_TESTS: true
- name: "Windows (SHA256, amd64, Visual Studio)" - name: "Windows (SHA256, amd64, Visual Studio)"
id: windows-sha256 id: windows-sha256
os: windows-2019 os: windows-2022
env: env:
ARCH: amd64 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 CMAKE_OPTIONS: -A x64 -DWIN32_LEAKCHECK=ON -DDEPRECATE_HARD=ON -DEXPERIMENTAL_SHA256=ON
SKIP_SSH_TESTS: true SKIP_SSH_TESTS: true
SKIP_NEGOTIATE_TESTS: true SKIP_NEGOTIATE_TESTS: true

6
ci/setup-ios-build.sh
View File

@@ -3,8 +3,10 @@
set -ex set -ex
brew update 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 curl -s -L https://raw.githubusercontent.com/leetal/ios-cmake/master/ios.toolchain.cmake -o ios.toolchain.cmake

6
ci/setup-osx-build.sh
View File

@@ -3,6 +3,8 @@
set -ex set -ex
brew update 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