From b9c763c4f492236c487a40193c88ab44900eac90 Mon Sep 17 00:00:00 2001
From: Manuel Cortez <manuel@manuelcortez.net>
Date: Sun, 19 Jul 2020 08:36:30 -0500
Subject: [PATCH] New attempt

---
 .gitlab-ci.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e1d78f8..4812833 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ variables:
   NSIS: "C:\\nsis\\makensis.exe"
 
 default:
-  image: python:3.8.4-windowsservercore
+  image: mcr.microsoft.com/windows/servercore:1809-amd64
 
 ### Stage list
 # Build: This will be the main stage generating stuff in the dist folder. Jobs present in this stage will run py2exe or pyinstaller files accordingly.
@@ -19,10 +19,12 @@ stages:
     - windows10
   before_script:
     - '$ProgressPreference = "SilentlyContinue"'
-    - 'Invoke-WebRequest -UseBasicParsing -Uri "https://github.com/git-for-windows/git/releases/download/v2.27.0.windows.1/Git-2.27.0-32-bit.exe" -OutFile "git_setup.exe"'
-    - '.\git_setup.exe /verysilent /NORESTART /NOCANCEL /SP- /CLOSEAPPLICATIONS /RESTARTAPPLICATIONS /COMPONENTS="icons,ext\reg\shellhere,assoc,assoc_sh" /dir=C:\git'
-    - '$env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";C:\git\cmd\;" + [System.Environment]::GetEnvironmentVariable("Path","User") '
-    - '$env:PATH'
+    - 'Set-ExecutionPolicy Bypass -Scope Process -Force; iwr https://chocolatey.org/install.ps1 -UseBasicParsing | iex'
+    - 'choco install -y --x86 python git nsis'
+#    - 'Invoke-WebRequest -UseBasicParsing -Uri "https://github.com/git-for-windows/git/releases/download/v2.27.0.windows.1/Git-2.27.0-32-bit.exe" -OutFile "git_setup.exe"'
+#    - '.\git_setup.exe /verysilent /NORESTART /NOCANCEL /SP- /CLOSEAPPLICATIONS /RESTARTAPPLICATIONS /COMPONENTS="icons,ext\reg\shellhere,assoc,assoc_sh" /dir=C:\git'
+#    - '$env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";C:\git\cmd\;" + [System.Environment]::GetEnvironmentVariable("Path","User") '
+#    - '$env:PATH'
     - 'python -V'
 #    - '&$env:PYTHON3_32 -m venv env'
 #    - 'env\scripts\activate'