gitlab-ci: Use shared Windows runners from gitlab

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
(cherry picked from commit 7657994aed)
This commit is contained in:
Andreas Schneider
2021-05-26 09:04:33 +02:00
committed by Jakub Jelen
parent a629f687cd
commit a10aeb9490

View File

@@ -455,7 +455,15 @@ tumbleweed/static-analysis:
paths: paths:
- obj/scan - obj/scan
visualstudio/x86_64: ###############################################################################
# Visual Studio builds #
###############################################################################
.vs:
stage: test
cache:
key: vcpkg.${CI_JOB_NAME}
paths:
- .vcpkg
variables: variables:
ErrorActionPreference: STOP ErrorActionPreference: STOP
script: script:
@@ -470,46 +478,42 @@ visualstudio/x86_64:
- cmake --build . - cmake --build .
- ctest --output-on-failure - ctest --output-on-failure
tags: tags:
- vs2017
- windows - windows
- shared-windows
except: except:
- tags - tags
only:
- branches@libssh/libssh-mirror
- branches@ansasaki/libssh-mirror
- branches@cryptomilk/libssh-mirror
- branches@jjelen/libssh-mirror
artifacts: artifacts:
expire_in: 1 week expire_in: 1 week
when: on_failure when: on_failure
paths: paths:
- obj/ - obj/
before_script:
visualstudio/x86: - choco install --no-progress -y cmake
variables: - $env:Path += ';C:\Program Files\CMake\bin'
ErrorActionPreference: STOP - If (!(test-path .vcpkg\archives)) { mkdir -p .vcpkg\archives }
script: - $env:VCPKG_DEFAULT_BINARY_CACHE="$PWD\.vcpkg\archives"
- $env:VCPKG_DEFAULT_TRIPLET="x86-windows" - echo $env:VCPKG_DEFAULT_BINARY_CACHE
- $env:VCPKG_DEFAULT_TRIPLET="$TRIPLET-windows"
- vcpkg install cmocka
- vcpkg install openssl
- vcpkg install zlib
- vcpkg integrate install
- mkdir -p obj; if ($?) {cd obj}; if (! $?) {exit 1} - mkdir -p obj; if ($?) {cd obj}; if (! $?) {exit 1}
- cmake - cmake
-DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_TOOLCHAIN_FILE" -A $PLATFORM
-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
-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 ..
- cmake --build .
- ctest --output-on-failure visualstudio/x86_64:
tags: extends: .vs
- vs2017 variables:
- windows PLATFORM: "x64"
except: TRIPLET: "x64"
- tags
only: visualstudio/x86:
- branches@libssh/libssh-mirror extends: .vs
- branches@ansasaki/libssh-mirror variables:
- branches@cryptomilk/libssh-mirror PLATFORM: "win32"
- branches@jjelen/libssh-mirror TRIPLET: "x86"
artifacts:
expire_in: 1 week
when: on_failure
paths:
- obj/