diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 1c826c1c..00000000 --- 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/macos-ios.yml b/.github/workflows/macos-ios.yml index fdc7d3be..7bb4c037 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 00000000..f8409f26 --- /dev/null +++ b/.github/workflows/windows.yml @@ -0,0 +1,41 @@ +name: Windows CI + +on: [push, pull_request] + +jobs: + build: + + runs-on: windows-2022 + + steps: + - uses: actions/checkout@v4 + - uses: microsoft/setup-msbuild@v2 + - uses: actions/setup-python@v5 + with: + python-version: '3.x' + - 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 + ninja -C build + - name: test + run: | + meson test -C build + - name: vcstatic + run: | + msbuild otherbuilds\rubberband-library.vcxproj /t:Build /p:Configuration=Release + - name: dotnet + run: | + 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 diff --git a/README.md b/README.md index d919da68..af9d1902 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