Skip to content

Commit

Permalink
Use choco to install meson and ninja on Windows
Browse files Browse the repository at this point in the history
Since the pip version uses outdated version of meson where diff_files is broken
  • Loading branch information
mikedickey committed Jan 11, 2024
1 parent f7c0933 commit 39a6e55
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 10 deletions.
17 changes: 12 additions & 5 deletions .github/workflows/jacktrip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -282,13 +282,20 @@ jobs:
if: runner.os == 'Windows'
shell: bash
run: |
choco install jack --version=1.9.17 --no-progress
choco install pkgconfiglite --no-progress
if [[ "${{ matrix.build-system }}" == "meson" ]]; then
python -m pip install --upgrade pip
pip install meson ninja
mv /usr/bin/link.exe /usr/bin/link_disabled # disable gnu linker
# hack to get rid of faulty patch.exe since it breaks meson diff_files
rm -f c:/Strawberry/c/bin/patch.exe c:/Strawberry/perl/site/bin/patch.exe c:/Strawberry/perl/bin/patch.exe "C:/Program Files/Git/usr/bin/patch.exe"
# use working version of patch.exe in msys, see https://github.com/actions/runner-images/issues/1552
echo "C:\msys64\usr\bin" >> $GITHUB_PATH
# install older meson from choco which uses patch, since git is broken
# see https://github.com/mesonbuild/meson/issues/12092 and https://github.com/mesonbuild/meson/pull/12248
choco install meson --version=1.1.1 --no-progress
echo "C:\Program Files\Meson" >> $GITHUB_PATH
# disable gnu linker since it can conflict with MSVC
rm -f /usr/bin/link.exe C:/msys64/usr/bin/link.EXE
fi
choco install jack --version=1.9.17 --no-progress
choco install pkgconfiglite --no-progress
- name: setup MSVC
uses: ilammy/msvc-dev-cmd@v1
if: runner.os == 'Windows'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
diff --git a/RtAudio.cpp b/RtAudio.cpp
index 0a55be1..bbe2539 100644
--- a/RtAudio.cpp
+++ b/RtAudio.cpp
@@ -1981,7 +1981,7 @@ void RtApiCore :: closeStream( void )
--- a/RtAudio.cpp 2024-01-11 13:04:29.148565300 -0800
+++ b/RtAudio.cpp 2024-01-11 13:04:42.305228600 -0800
@@ -1981,7 +1981,7 @@
}
}

Expand Down

0 comments on commit 39a6e55

Please sign in to comment.