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

---
 .appveyor.yml                        | 2 +-
 .github/workflows/windows-dotnet.yml | 3 +--
 .github/workflows/windows.yml        | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 2c1ca07..61362b6 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -16,5 +16,5 @@ install:
 
 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 (x86)\Mega-Nerd\libsndfile\include" -Dextra_lib_dirs="C:\Program Files (x86)\Mega-Nerd\libsndfile\lib\"
+  - meson build -Dextra_include_dirs="C:\Program Files\Mega-Nerd\libsndfile\include" -Dextra_lib_dirs="C:\Program Files\Mega-Nerd\libsndfile\lib\"
   - ninja -C build
diff --git a/.github/workflows/windows-dotnet.yml b/.github/workflows/windows-dotnet.yml
index 750b2a2..f52ea86 100644
--- a/.github/workflows/windows-dotnet.yml
+++ b/.github/workflows/windows-dotnet.yml
@@ -1,4 +1,4 @@
-name: Windows CI
+name: Windows .NET CI
 
 on:
   push:
@@ -13,6 +13,5 @@ jobs:
     - uses: actions/checkout@v2
     - name: make
       run: |
-        call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
         msbuild dotnet\rubberband.sln
 
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 34bb6da..0f5caf5 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -19,8 +19,8 @@ jobs:
         .\libsndfile-1.0.28-w64-setup.exe /silent /sp- /norestart
     - name: configure
       run: |
-        meson build
+        c:\ProgramData\chocolatey\bin\meson build
     - name: make
       run: |
-        ninja -C build
+        c:\ProgramData\chocolatey\bin\ninja -C build