From 83522231e525e42889ae9a85c6fed957870ffa3a Mon Sep 17 00:00:00 2001 From: Chris Cannam Date: Thu, 7 Mar 2024 14:17:59 +0000 Subject: [PATCH 1/7] Add GH Windows build --- .github/workflows/macos-ios.yml | 4 ++-- .github/workflows/windows.yml | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/windows.yml diff --git a/.github/workflows/macos-ios.yml b/.github/workflows/macos-ios.yml index fdc7d3b..7bb4c03 100644 --- a/.github/workflows/macos-ios.yml +++ b/.github/workflows/macos-ios.yml @@ -14,9 +14,9 @@ jobs: - name: deps run: brew install libsndfile libsamplerate vamp-plugin-sdk meson ninja - name: configure macos - run: meson build_macos + run: meson setup build_macos - name: configure ios - run: meson build_ios --cross-file cross/ios.txt + run: meson setup build_ios --cross-file cross/ios.txt - name: make macos run: ninja -C build_macos - name: make ios diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml new file mode 100644 index 0000000..2d4c4d5 --- /dev/null +++ b/.github/workflows/windows.yml @@ -0,0 +1,25 @@ +name: Windows CI + +on: [push, pull_request] + +jobs: + build: + + runs-on: windows-2022 + + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + with: + python-version: '3.x' + - name: deps + run: | + pip install meson + pip install ninja + - name: make + run: | + meson setup build + ninja -C build + - name: test + run: | + meson test -C build From c496db633e05e6b845930c96cda023275c2366f5 Mon Sep 17 00:00:00 2001 From: Chris Cannam Date: Thu, 7 Mar 2024 14:26:13 +0000 Subject: [PATCH 2/7] Point at GH CI --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d919da6..af9d190 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ CI builds: * [![Build status](https://builds.sr.ht/~breakfastquay/rubberband.svg)](https://builds.sr.ht/~breakfastquay/rubberband?) (Linux) * [![Build Status](https://github.com/breakfastquay/rubberband/workflows/macOS%20and%20iOS%20CI/badge.svg)](https://github.com/breakfastquay/rubberband/actions?query=workflow%3A%22macOS+and+iOS+CI%22) (macOS, iOS) -* [![Build Status](https://ci.appveyor.com/api/projects/status/hhhhpf718jwhpyf6?svg=true)](https://ci.appveyor.com/project/breakfastquay/rubberband) (Windows) +* [![Build Status](https://github.com/breakfastquay/rubberband/workflows/Windows%20CI/badge.svg)](https://github.com/breakfastquay/rubberband/actions?query=workflow%3A%22Windows+CI%22) (Windows) ## Licence From 4d219f95a810d82618231cb9fe6f0425f03ba010 Mon Sep 17 00:00:00 2001 From: Chris Cannam Date: Thu, 7 Mar 2024 14:26:19 +0000 Subject: [PATCH 3/7] A couple of further builds --- .github/workflows/windows.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 2d4c4d5..a87c7c1 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -23,3 +23,8 @@ jobs: - name: test run: | meson test -C build + - name: vcstatic + run: | + msbuild otherbuilds\rubberband-library.vcxproj /t:Build /p:Configuration=Release + - name: dotnet + msbuild dotnet\rubberband.sln /t:Restore;Build From db2ed7496da3aa320aa91d646cdaf69b99726a9b Mon Sep 17 00:00:00 2001 From: Chris Cannam Date: Thu, 7 Mar 2024 14:29:47 +0000 Subject: [PATCH 4/7] Attempt choco deps install --- .github/workflows/windows.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a87c7c1..bf09064 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -12,10 +12,14 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.x' - - name: deps + - name: pipdeps run: | pip install meson pip install ninja + - name: chocodeps + uses: crazy-max/ghaction-chocolatey@v3 + with: + args: install libsndfile - name: make run: | meson setup build @@ -28,3 +32,5 @@ jobs: msbuild otherbuilds\rubberband-library.vcxproj /t:Build /p:Configuration=Release - name: dotnet msbuild dotnet\rubberband.sln /t:Restore;Build + - name: single + cl main\main.cpp single\RubberBandSingle.cpp .\src\ext\getopt\getopt.c src\ext\getopt\getopt_long.c "C:\Program Files\libsndfile\lib\sndfile.lib" /O2 /std:c++14 /D_USE_MATH_DEFINES /DNOMINMAX /EHs /I"C:\Program Files\libsndfile\include" /link /out:test_single.exe From 472efc5555de08116586fa5ee0f6444b2cd78354 Mon Sep 17 00:00:00 2001 From: Chris Cannam Date: Thu, 7 Mar 2024 14:30:40 +0000 Subject: [PATCH 5/7] Fix syntax --- .github/workflows/windows.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index bf09064..e4b0ee6 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -31,6 +31,8 @@ jobs: run: | msbuild otherbuilds\rubberband-library.vcxproj /t:Build /p:Configuration=Release - name: dotnet + run: | msbuild dotnet\rubberband.sln /t:Restore;Build - name: single + run: | cl main\main.cpp single\RubberBandSingle.cpp .\src\ext\getopt\getopt.c src\ext\getopt\getopt_long.c "C:\Program Files\libsndfile\lib\sndfile.lib" /O2 /std:c++14 /D_USE_MATH_DEFINES /DNOMINMAX /EHs /I"C:\Program Files\libsndfile\include" /link /out:test_single.exe From f453ca9d77318fe8cfa99f0b5bda3c0f7f534893 Mon Sep 17 00:00:00 2001 From: Chris Cannam Date: Thu, 7 Mar 2024 14:37:20 +0000 Subject: [PATCH 6/7] Fix for msbuild --- .github/workflows/windows.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e4b0ee6..4205879 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -9,6 +9,7 @@ jobs: steps: - uses: actions/checkout@v4 + - uses: microsoft/setup-msbuild@v2 - uses: actions/setup-python@v5 with: python-version: '3.x' @@ -33,6 +34,3 @@ jobs: - name: dotnet run: | msbuild dotnet\rubberband.sln /t:Restore;Build - - name: single - run: | - cl main\main.cpp single\RubberBandSingle.cpp .\src\ext\getopt\getopt.c src\ext\getopt\getopt_long.c "C:\Program Files\libsndfile\lib\sndfile.lib" /O2 /std:c++14 /D_USE_MATH_DEFINES /DNOMINMAX /EHs /I"C:\Program Files\libsndfile\include" /link /out:test_single.exe From 3723845be3e2000797d9789a20d5524d991317bd Mon Sep 17 00:00:00 2001 From: Chris Cannam Date: Thu, 7 Mar 2024 14:42:57 +0000 Subject: [PATCH 7/7] Quoting; move away from AppVeyor CI --- .appveyor.yml | 26 -------------------------- .github/workflows/windows.yml | 7 ++++++- 2 files changed, 6 insertions(+), 27 deletions(-) delete mode 100644 .appveyor.yml diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 1c826c1..0000000 --- a/.appveyor.yml +++ /dev/null @@ -1,26 +0,0 @@ - -image: - - Visual Studio 2019 - -configuration: - - Release - -platform: - - x64 - -install: - - cinst wget - - 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\libsndfile\include" "-Dextra_lib_dirs=C:\Program Files\libsndfile\lib" - - ninja -C build - - meson test -C build - # Test the VC++ static library build, which is separate - - msbuild otherbuilds\rubberband-library.vcxproj /t:Build /p:Configuration=Release - # Test the .NET FFI interface build, which is again separate - - msbuild dotnet\rubberband.sln /t:Restore;Build - # And test the single-file build - - cl main\main.cpp single\RubberBandSingle.cpp .\src\ext\getopt\getopt.c src\ext\getopt\getopt_long.c "C:\Program Files\libsndfile\lib\sndfile.lib" /O2 /std:c++14 /D_USE_MATH_DEFINES /DNOMINMAX /EHs /I"C:\Program Files\libsndfile\include" /link /out:test_single.exe - diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 4205879..f8409f2 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -33,4 +33,9 @@ jobs: msbuild otherbuilds\rubberband-library.vcxproj /t:Build /p:Configuration=Release - name: dotnet run: | - msbuild dotnet\rubberband.sln /t:Restore;Build + msbuild dotnet\rubberband.sln "/t:Restore;Build" + +## (Commented out as cl not in path - to fix) +# - name: single +# run: | +# cl main\main.cpp single\RubberBandSingle.cpp .\src\ext\getopt\getopt.c src\ext\getopt\getopt_long.c "C:\Program Files\libsndfile\lib\sndfile.lib" /O2 /std:c++14 /D_USE_MATH_DEFINES /DNOMINMAX /EHs /I"C:\Program Files\libsndfile\include" /link /out:test_single.exe