aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2021-05-26 09:04:33 +0200
committerJakub Jelen <jjelen@redhat.com>2021-08-17 16:12:32 +0200
commita10aeb94904d0474de7407d89fd5c2878c1dead6 (patch)
tree22996c9d6e8aeef5113fba1ec3c3d49f623b6fa8
parenta629f687cd070e404d9fe7d0ad0ada8cf119c5e1 (diff)
downloadlibssh-a10aeb94904d0474de7407d89fd5c2878c1dead6.tar.gz
libssh-a10aeb94904d0474de7407d89fd5c2878c1dead6.tar.xz
libssh-a10aeb94904d0474de7407d89fd5c2878c1dead6.zip
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 7657994aed5e18c208c83635befa8597aa5317e2)
-rw-r--r--.gitlab-ci.yml66
1 files changed, 35 insertions, 31 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8570694e..a1ca84de 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -455,7 +455,15 @@ tumbleweed/static-analysis:
paths:
- obj/scan
-visualstudio/x86_64:
+###############################################################################
+# Visual Studio builds #
+###############################################################################
+.vs:
+ stage: test
+ cache:
+ key: vcpkg.${CI_JOB_NAME}
+ paths:
+ - .vcpkg
variables:
ErrorActionPreference: STOP
script:
@@ -470,46 +478,42 @@ visualstudio/x86_64:
- cmake --build .
- ctest --output-on-failure
tags:
- - vs2017
- windows
+ - shared-windows
except:
- tags
- only:
- - branches@libssh/libssh-mirror
- - branches@ansasaki/libssh-mirror
- - branches@cryptomilk/libssh-mirror
- - branches@jjelen/libssh-mirror
artifacts:
expire_in: 1 week
when: on_failure
paths:
- obj/
-
-visualstudio/x86:
- variables:
- ErrorActionPreference: STOP
- script:
- - $env:VCPKG_DEFAULT_TRIPLET="x86-windows"
+ before_script:
+ - choco install --no-progress -y cmake
+ - $env:Path += ';C:\Program Files\CMake\bin'
+ - If (!(test-path .vcpkg\archives)) { mkdir -p .vcpkg\archives }
+ - $env:VCPKG_DEFAULT_BINARY_CACHE="$PWD\.vcpkg\archives"
+ - 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}
- cmake
- -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_TOOLCHAIN_FILE"
+ -A $PLATFORM
+ -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
-DPICKY_DEVELOPER=ON
-DWITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON -DWITH_PCAP=ON
-DUNIT_TESTING=ON ..
- - cmake --build .
- - ctest --output-on-failure
- tags:
- - vs2017
- - windows
- except:
- - tags
- only:
- - branches@libssh/libssh-mirror
- - branches@ansasaki/libssh-mirror
- - branches@cryptomilk/libssh-mirror
- - branches@jjelen/libssh-mirror
- artifacts:
- expire_in: 1 week
- when: on_failure
- paths:
- - obj/
+
+visualstudio/x86_64:
+ extends: .vs
+ variables:
+ PLATFORM: "x64"
+ TRIPLET: "x64"
+
+visualstudio/x86:
+ extends: .vs
+ variables:
+ PLATFORM: "win32"
+ TRIPLET: "x86"