From 5a1e5ecf38df449bd2f8de547419c5808697c447 Mon Sep 17 00:00:00 2001
From: Mark Roszko <mark.roszko@gmail.com>
Date: Sun, 17 Jul 2022 18:11:43 +0000
Subject: [PATCH] Re-enable the MSVC CI job

---
 .gitlab-ci.yml         |  2 +-
 .gitlab/Windows-CI.yml | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f322f0cc31..5581a7c829 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,7 +40,7 @@ include:
   - local: '/.gitlab/templates.yml'
   - local: '/.gitlab/Fedora-Linux-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/linux-metadata-validate.yml'
   - local: '/.gitlab/doxygen.yml'
diff --git a/.gitlab/Windows-CI.yml b/.gitlab/Windows-CI.yml
index af0f8ef395..d080b582e1 100644
--- a/.gitlab/Windows-CI.yml
+++ b/.gitlab/Windows-CI.yml
@@ -7,16 +7,27 @@ win64_build:
     - kicad-windows-1809
   extends: .only_code
   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:
     - branches@kicad/code/kicad
     - tags@kicad/code/kicad
   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
     - cd build/windows
     - cmake `
       -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 `
       -DKICAD_SCRIPTING_WXPYTHON=OFF `
       -DKICAD_USE_OCC=ON `