From ade265ec6b8cef1d40a5a1d064f21d7d50356c6c Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Tue, 21 Apr 2020 23:44:55 +0200
Subject: [PATCH 1/4] give shared windows runners a try

---
 .gitlab-ci.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 79eb6795f..dfeb37a75 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,10 +42,7 @@ MacOS:
 
 Windows:
   tags:
-    - win10
-    - msvc2017
-  except:
-    - branches # because our CI VMs are not public, MRs can't use them and timeout
+    - windows
   stage: build
   allow_failure: true
   script:

From 0021dabd8e4d62462c91052e001ad95135d89f6a Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 22 Apr 2020 00:22:48 +0200
Subject: [PATCH 2/4] powershell hell

---
 .gitlab-ci.yml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dfeb37a75..b466d011b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,8 +3,9 @@ stages:
   
 Debian:
   tags:
-    - docker
-    - linux
+#    - docker
+#    - linux
+    - none_remove_me
   image: gcc
   cache:
     key: apt-cache
@@ -46,7 +47,14 @@ Windows:
   stage: build
   allow_failure: true
   script:
-    # - env  # turn on for debugging
+    - Set-Variable -Name "time" -Value (date -Format "%H:%m")
+    - echo ${time}
+    - echo "started by ${GITLAB_USER_NAME}"
+    - (New-Object System.Net.WebClient).DownloadFile(http://repo.msys2.org/distrib/x86_64/msys2-x86_64-20190524.exe, $PSScriptRoot\msys2.exe)
+    - $result = Start-Process -Wait -FilePath '$PSScriptRoot\msys2.exe' -ArgumentList '/S' -PassThru
+    - echo ${result}
+    - bash
+    - env  # turn on for debugging
     - sh %CI_PROJECT_DIR%/CI/before_script.msvc.sh -c Release -p x64 -v 2017 -V
     - SET msBuildLocation="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe"
     - call %msBuildLocation% MSVC2017_64\OpenMW.sln /t:Build /p:Configuration=Release /m:%NUMBER_OF_PROCESSORS%

From b38459e50558af6af0fc0335344e1d251bb8d7ad Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 22 Apr 2020 00:30:08 +0200
Subject: [PATCH 3/4] powershell hell 2

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b466d011b..8a5740de8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,7 +50,7 @@ Windows:
     - Set-Variable -Name "time" -Value (date -Format "%H:%m")
     - echo ${time}
     - echo "started by ${GITLAB_USER_NAME}"
-    - (New-Object System.Net.WebClient).DownloadFile(http://repo.msys2.org/distrib/x86_64/msys2-x86_64-20190524.exe, $PSScriptRoot\msys2.exe)
+    - (New-Object System.Net.WebClient).DownloadFile('http://repo.msys2.org/distrib/x86_64/msys2-x86_64-20190524.exe', '$PSScriptRoot\msys2.exe')
     - $result = Start-Process -Wait -FilePath '$PSScriptRoot\msys2.exe' -ArgumentList '/S' -PassThru
     - echo ${result}
     - bash

From 6f1767c37408adc0ac4ceaeb3f7be8e489a8ffb5 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 22 Apr 2020 10:36:11 +0200
Subject: [PATCH 4/4] just get the thing working and leave it up to someone
 with more win10 knowledge than myself :)

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8a5740de8..514bac1ad 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,9 +3,8 @@ stages:
   
 Debian:
   tags:
-#    - docker
-#    - linux
-    - none_remove_me
+    - docker
+    - linux
   image: gcc
   cache:
     key: apt-cache
@@ -24,6 +23,7 @@ Debian:
   artifacts:
     paths:
       - build/artifacts/
+
 MacOS:
   tags:
     - macos
@@ -50,15 +50,14 @@ Windows:
     - Set-Variable -Name "time" -Value (date -Format "%H:%m")
     - echo ${time}
     - echo "started by ${GITLAB_USER_NAME}"
-    - (New-Object System.Net.WebClient).DownloadFile('http://repo.msys2.org/distrib/x86_64/msys2-x86_64-20190524.exe', '$PSScriptRoot\msys2.exe')
-    - $result = Start-Process -Wait -FilePath '$PSScriptRoot\msys2.exe' -ArgumentList '/S' -PassThru
-    - echo ${result}
-    - bash
-    - env  # turn on for debugging
-    - sh %CI_PROJECT_DIR%/CI/before_script.msvc.sh -c Release -p x64 -v 2017 -V
-    - SET msBuildLocation="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe"
-    - call %msBuildLocation% MSVC2017_64\OpenMW.sln /t:Build /p:Configuration=Release /m:%NUMBER_OF_PROCESSORS%
-    - 7z a OpenMW_MSVC2017_64_%CI_BUILD_REF_NAME%_%CI_BUILD_ID%.zip %CI_PROJECT_DIR%\MSVC2017_64\Release\
+#   TODO: to anyone wanting to do further work here, we need to figure out how to get the below working
+#   TODO: on gitlab's new shared windows runners. They currently don't have bash or anything else installed
+#   TODO: it is currently just a bare windows 10 with powershell.
+#    - env  # turn on for debugging
+#    - sh %CI_PROJECT_DIR%/CI/before_script.msvc.sh -c Release -p x64 -v 2017 -V
+#    - SET msBuildLocation="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe"
+#    - call %msBuildLocation% MSVC2017_64\OpenMW.sln /t:Build /p:Configuration=Release /m:%NUMBER_OF_PROCESSORS%
+#    - 7z a OpenMW_MSVC2017_64_%CI_BUILD_REF_NAME%_%CI_BUILD_ID%.zip %CI_PROJECT_DIR%\MSVC2017_64\Release\
   cache:
     paths:
     - deps