ci: Sync VS targets with master

Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Norbert Pocs <npocs@redhat.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Jakub Jelen
2023-04-17 18:20:05 +02:00
parent 31a33fd2fd
commit c26414972a

View File

@@ -469,14 +469,6 @@ tumbleweed/static-analysis:
variables: variables:
ErrorActionPreference: STOP ErrorActionPreference: STOP
script: script:
- $env:VCPKG_DEFAULT_TRIPLET="x64-windows"
- mkdir -p obj; if ($?) {cd obj}; if (! $?) {exit 1}
- cmake
-A x64
-DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_TOOLCHAIN_FILE"
-DPICKY_DEVELOPER=ON
-DWITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON -DWITH_PCAP=ON
-DUNIT_TESTING=ON ..
- cmake --build . - cmake --build .
- ctest --output-on-failure - ctest --output-on-failure
tags: tags:
@@ -490,8 +482,6 @@ tumbleweed/static-analysis:
paths: paths:
- obj/ - obj/
before_script: before_script:
- choco install --no-progress -y cmake
- $env:Path += ';C:\Program Files\CMake\bin'
- If (!(test-path .vcpkg\archives)) { mkdir -p .vcpkg\archives } - If (!(test-path .vcpkg\archives)) { mkdir -p .vcpkg\archives }
- $env:VCPKG_DEFAULT_BINARY_CACHE="$PWD\.vcpkg\archives" - $env:VCPKG_DEFAULT_BINARY_CACHE="$PWD\.vcpkg\archives"
- echo $env:VCPKG_DEFAULT_BINARY_CACHE - echo $env:VCPKG_DEFAULT_BINARY_CACHE
@@ -507,9 +497,6 @@ tumbleweed/static-analysis:
-DPICKY_DEVELOPER=ON -DPICKY_DEVELOPER=ON
-DWITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON -DWITH_PCAP=ON -DWITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON -DWITH_PCAP=ON
-DUNIT_TESTING=ON .. -DUNIT_TESTING=ON ..
# The Windows runners are broken for last month
# https://gitlab.com/gitlab-org/ci-cd/shared-runners/images/gcp/windows-containers/-/issues/40
allow_failure: true
visualstudio/x86_64: visualstudio/x86_64:
extends: .vs extends: .vs