Merge pull request #124 from Murmele/updateGit

update git to 2.35.1
This commit is contained in:
Murmele 2022-05-01 10:49:04 +02:00 committed by GitHub
commit b0c71b6cd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions

View File

@ -138,8 +138,9 @@ jobs:
openssl_arch: VC-WIN64A
msvc_arch: x64
cmake_env:
CC: cl
CXX: cl
CMAKE_RC_FLAGS: "/C 1252"
CC: clang
CXX: clang++
pack: 1
- name: win32
@ -150,9 +151,13 @@ jobs:
qt_arch_check_only: win32_msvc2017
openssl_arch: VC-WIN32
msvc_arch: x86
cmake_flags: "-DUSE_BUNDLED_ZLIB=1"
cmake_env:
CC: cl
CXX: cl
CMAKE_RC_FLAGS: "/C 1252"
CC: clang
CXX: clang++
CMAKE_C_FLAGS: -m32
CMAKE_CXX_FLAGS: -m32
pack: 1
steps:
@ -241,7 +246,7 @@ jobs:
run: |
mkdir -p build/release
cd build/release
cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ${{ env.CMAKE_FLAGS }} ../..
cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ${{ env.CMAKE_FLAGS }} ${{ matrix.env.cmake_flags }} ../..
- name: Build Information
run: |

@ -1 +1 @@
Subproject commit 0d0ac3826a3bbb9247e39e12623bbcfdd722f24c
Subproject commit 4c53a8c20f8984adb226293a3ffd7b88c3f4ac1a