From 6e40891fe507473bc40c8b902ffe049972f31992 Mon Sep 17 00:00:00 2001
From: Chris Cannam <cannam@all-day-breakfast.com>
Date: Thu, 11 Feb 2021 14:50:17 +0000
Subject: [PATCH] Further CI tweaks

---
 .appveyor.yml                        |  8 +++++---
 .github/workflows/windows-dotnet.yml | 17 -----------------
 .github/workflows/windows.yml        | 26 --------------------------
 3 files changed, 5 insertions(+), 46 deletions(-)
 delete mode 100644 .github/workflows/windows-dotnet.yml
 delete mode 100644 .github/workflows/windows.yml

diff --git a/.appveyor.yml b/.appveyor.yml
index 7678a37..0a12e7d 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -11,10 +11,12 @@ platform:
 install:
   - cinst wget
   - cinst meson
-  - c:\ProgramData\chocolatey\bin\wget.exe http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.28-w64-setup.exe
-  - ps: .\libsndfile-1.0.28-w64-setup.exe /silent /sp- /norestart
+  - cinst libsndfile
 
 build_script:
   - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
-  - meson build -Dextra_include_dirs='C:\Program Files\Mega-Nerd\libsndfile\include' -Dextra_lib_dirs='C:\Program Files\Mega-Nerd\libsndfile\lib'
+  - meson build "-Dextra_include_dirs=C:\Program Files\libsndfile\include" "-Dextra_lib_dirs=C:\Program Files\libsndfile\lib"
   - ninja -C build
+  # And test the .NET FFI interface build, which is completely separate
+  - msbuild dotnet\rubberband.sln
+  
diff --git a/.github/workflows/windows-dotnet.yml b/.github/workflows/windows-dotnet.yml
deleted file mode 100644
index f52ea86..0000000
--- a/.github/workflows/windows-dotnet.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: Windows .NET CI
-
-on:
-  push:
-  pull_request:
-
-jobs:
-  build:
-
-    runs-on: windows-2019
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: make
-      run: |
-        msbuild dotnet\rubberband.sln
-
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
deleted file mode 100644
index 0f5caf5..0000000
--- a/.github/workflows/windows.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: Windows CI
-
-on:
-  push:
-  pull_request:
-
-jobs:
-  build:
-
-    runs-on: windows-2019
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: deps
-      run: |
-        cinst wget
-        cinst meson
-        c:\ProgramData\chocolatey\bin\wget.exe http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.28-w64-setup.exe
-        .\libsndfile-1.0.28-w64-setup.exe /silent /sp- /norestart
-    - name: configure
-      run: |
-        c:\ProgramData\chocolatey\bin\meson build
-    - name: make
-      run: |
-        c:\ProgramData\chocolatey\bin\ninja -C build
-