diff options
| author | Andreas Schneider <asn@cryptomilk.org> | 2022-03-01 08:01:53 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2023-02-16 15:31:19 +0100 |
| commit | 77476f7052ea07381d732b548fb99e05bcf3d2f2 (patch) | |
| tree | bdb5affd4060e2d4e761a8df5891221003c1be68 | |
| parent | 200393beb54c3e73da9d8dfa2abceed7bdf5db1e (diff) | |
| download | cmocka-77476f7052ea07381d732b548fb99e05bcf3d2f2.zip cmocka-77476f7052ea07381d732b548fb99e05bcf3d2f2.tar.gz cmocka-77476f7052ea07381d732b548fb99e05bcf3d2f2.tar.bz2 | |
gitlab-ci: Use gitlab windows runners
| -rw-r--r-- | .gitlab-ci.yml | 71 |
1 files changed, 32 insertions, 39 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7686d05..fef6147 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -355,57 +355,50 @@ ubuntu/x86_64: paths: - obj/ -visualstudio/x86_64: - script: - - $env:VCPKG_DEFAULT_TRIPLET="x64-windows" - - mkdir obj - - cd obj - - cmake - -A x64 - -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_TOOLCHAIN_FILE" - -DCMAKE_BUILD_TYPE=Debug - -DPICKY_DEVELOPER=ON - -DUNIT_TESTING=ON .. - - cmake --build . - - ctest --output-on-failure +############################################################################### +# Visual Studio builds # +############################################################################### +.vs: + stage: test + cache: + key: vcpkg.${CI_JOB_NAME} + paths: + - .vcpkg + variables: + ErrorActionPreference: STOP tags: - - vs2017 - windows + - shared-windows except: - tags - only: - - branches@cmocka/cmocka - - branches@ansasaki/cmocka - - branches@cryptomilk/cmocka artifacts: expire_in: 1 week when: on_failure paths: - obj/ - -visualstudio/x86: - script: - - $env:VCPKG_DEFAULT_TRIPLET="x86-windows" - - mkdir obj - - cd obj + before_script: + - choco install --no-progress -y cmake + - $env:Path += ';C:\Program Files\CMake\bin' + - If (!(test-path .vcpkg\archives)) { mkdir -p .vcpkg\archives } + - mkdir -p obj; if ($?) {cd obj}; if (! $?) {exit 1} - cmake - -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_TOOLCHAIN_FILE" + -A $PLATFORM -DCMAKE_BUILD_TYPE=Debug + -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DPICKY_DEVELOPER=ON -DUNIT_TESTING=ON .. + script: - cmake --build . - ctest --output-on-failure - tags: - - vs2017 - - windows - except: - - tags - only: - - branches@cmocka/cmocka - - branches@ansasaki/cmocka - - branches@cryptomilk/cmocka - 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" |