haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-enable the MSVC CI job

This commit is contained in:
Mark Roszko 2022-07-17 18:11:43 +00:00
parent 1ade5a8c72
commit 5a1e5ecf38
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -40,7 +40,7 @@ include:
- local: '/.gitlab/templates.yml' - local: '/.gitlab/templates.yml'
- local: '/.gitlab/Fedora-Linux-CI.yml' - local: '/.gitlab/Fedora-Linux-CI.yml'
- local: '/.gitlab/Ubuntu-20.04-CI.yml' - local: '/.gitlab/Ubuntu-20.04-CI.yml'
#- local: '/.gitlab/Windows-CI.yml' - local: '/.gitlab/Windows-CI.yml'
- local: '/.gitlab/coverity.yml' - local: '/.gitlab/coverity.yml'
- local: '/.gitlab/linux-metadata-validate.yml' - local: '/.gitlab/linux-metadata-validate.yml'
- local: '/.gitlab/doxygen.yml' - local: '/.gitlab/doxygen.yml'

15
.gitlab/Windows-CI.yml
View File

@ -7,16 +7,27 @@ win64_build:
- kicad-windows-1809 - kicad-windows-1809
extends: .only_code extends: .only_code
interruptible: false interruptible: false
image: registry.gitlab.com/kicad/kicad-ci/source_containers/win64:msvc1809 image: registry.gitlab.com/kicad/kicad-ci/windows-build-image/win1809-msvc:latest
variables:
VCPKG_BINARY_SOURCES: 'nuget,kicad,readwrite'
cache:
key: win64-vcpkg-"$CI_COMMIT_REF_SLUG"
paths:
- build\windows\vcpkg_installed
- .vcpkgCache
only: only:
- branches@kicad/code/kicad - branches@kicad/code/kicad
- tags@kicad/code/kicad - tags@kicad/code/kicad
script: script:
- C:\builder\build.ps1 -Env -Arch x64
- $vcpkgCache=Join-Path -Path (Get-Location) -ChildPath ".vcpkgCache";$env:VCPKG_DEFAULT_BINARY_CACHE=$vcpkgCache;New-Item -ItemType Directory -Force -Path $vcpkgCache
- nuget.exe sources add -Name kicad -Source "https://nuget.kicad.org:443/v3/index.json"
- nuget.exe setapikey $env:NUGET_KEY -Source "https://nuget.kicad.org:443/v3/index.json"
- mkdir -p build/windows -Force - mkdir -p build/windows -Force
- cd build/windows - cd build/windows
- cmake ` - cmake `
-G "Ninja" ` -G "Ninja" `
-DCMAKE_TOOLCHAIN_FILE=C:\build\vcpkg\scripts\buildsystems\vcpkg.cmake ` -DCMAKE_TOOLCHAIN_FILE=C:\builder\vcpkg\scripts\buildsystems\vcpkg.cmake `
-DCMAKE_BUILD_TYPE=Debug ` -DCMAKE_BUILD_TYPE=Debug `
-DKICAD_SCRIPTING_WXPYTHON=OFF ` -DKICAD_SCRIPTING_WXPYTHON=OFF `
-DKICAD_USE_OCC=ON ` -DKICAD_USE_OCC=ON `