From 9d574f8dd7248a4cf8dcbe615f3058d34efb7ac3 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Sat, 11 Mar 2023 22:56:16 +0100
Subject: ci: bump to windows 2022

Skip failing funcitonaltests. Use jobstart() instead termopen() for
oldtests to prevent CI freezing.
---
 .github/workflows/test.yml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e6ff09d351..5e6f05d973 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -288,7 +288,7 @@ jobs:
         run: cmake --build build --config MinSizeRel
 
   windows:
-    runs-on: windows-2019
+    runs-on: windows-2022
     timeout-minutes: 45
     name: windows
     steps:
@@ -347,15 +347,20 @@ jobs:
         timeout-minutes: 20
         run: cmake --build build --target functionaltest
 
+      - if: success() || failure() && steps.abort_job.outputs.status == 'success'
+        uses: msys2/setup-msys2@v2
+        with:
+          update: true
+          pacboy: >-
+            make:p gcc:p
+          release: false
+
       - if: success() || failure() && steps.abort_job.outputs.status == 'success'
         name: Run oldtest
+        shell: msys2 {0}
         run: |
-          # Add MSYS to path, required for e.g. `find` used in test scripts.
-          # But would break functionaltest, where its `more` would be used then.
-          $OldPath = $env:PATH
-          $env:PATH = "C:\msys64\usr\bin;$env:PATH"
-          & "C:\msys64\mingw64\bin\mingw32-make.exe" -C $(Convert-Path test\old\testdir) VERBOSE=1
-          $env:PATH = $OldPath
+          cd test/old/testdir
+          mingw32-make VERBOSE=1
 
   with-external-deps:
     runs-on: ubuntu-22.04
-- 
cgit