From dbd7579d2e77187f1d4253d89a3766094e780797 Mon Sep 17 00:00:00 2001
From: Clayton Smith <argilo@gmail.com>
Date: Thu, 30 Nov 2023 13:22:54 -0500
Subject: [PATCH] Clean up Windows CI

---
 .github/workflows/ci.yml | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6a011de1..c4d9aa1d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -94,8 +94,11 @@ jobs:
         working-directory: build
         run: make -j4
   windows-build:
-    runs-on: windows-2019
+    runs-on: windows-latest
     name: Windows CI
+    defaults:
+      run:
+        shell: msys2 {0}
     steps:
     - name: Setup MSYS2
       uses: msys2/setup-msys2@v2
@@ -111,21 +114,19 @@ jobs:
           ninja:p
           libusb:p
           boost:p
-          qt5:p
+          qt6-base:p
+          qt6-svg:p
           spdlog:p
           volk:p
           libsndfile:p
-          soapysdr:p
           fftw:p
-          rtl-sdr:p
     - name: Clone and build GNU Radio
-      shell: msys2 {0}
       working-directory: ${{ runner.temp }}
       run: |
         git clone --depth 1 https://github.com/gnuradio/gnuradio.git
         cd gnuradio
         cmake -S . -B build \
-          -DCMAKE_INSTALL_PREFIX=C:/gqrx \
+          -DCMAKE_INSTALL_PREFIX=${RUNNER_TEMP}/msys64/mingw64 \
           -DENABLE_DEFAULT=OFF \
           -DENABLE_COMMON_PCH=ON \
           -DENABLE_GNURADIO_RUNTIME=ON \
@@ -139,26 +140,21 @@ jobs:
         cmake --build build
         cmake --install build
     - name: Clone and build gr-osmosdr
-      shell: msys2 {0}
       working-directory: ${{ runner.temp }}
       run: |
         git clone https://gitea.osmocom.org/sdr/gr-osmosdr.git
         cd gr-osmosdr
         cmake -S . -B build \
-          -DCMAKE_INSTALL_PREFIX=C:/gqrx \
-          -DCMAKE_PREFIX_PATH=C:/gqrx \
+          -DCMAKE_INSTALL_PREFIX=${RUNNER_TEMP}/msys64/mingw64 \
           -DENABLE_DEFAULT=OFF \
-          -DENABLE_RTL=ON \
-          -DENABLE_SOAPY=ON
+          -DENABLE_FILE=ON
         cmake --build build
         cmake --install build
     - name: Checkout code
       uses: actions/checkout@v3
     - name: Configure, compile & install
-      shell: msys2 {0}
       run: |
         cmake -S . -B build \
-          -DCMAKE_INSTALL_PREFIX=C:/gqrx \
-          -DCMAKE_PREFIX_PATH=C:/gqrx
+          -DCMAKE_INSTALL_PREFIX=C:/gqrx
         cmake --build build
         cmake --install build