From a90f72e6c501971e850c8a3f0cfc11f88996a53a Mon Sep 17 00:00:00 2001 From: Chris Cannam Date: Tue, 9 Feb 2021 12:06:07 +0000 Subject: [PATCH] CI update --- .build.yml | 8 +++++--- .travis.yml | 27 --------------------------- meson.build | 2 +- 3 files changed, 6 insertions(+), 31 deletions(-) delete mode 100644 .travis.yml diff --git a/.build.yml b/.build.yml index 5bd899e..b66fa42 100644 --- a/.build.yml +++ b/.build.yml @@ -1,4 +1,4 @@ -image: ubuntu/18.04 +image: ubuntu/20.04 packages: - pkg-config - libsamplerate0-dev @@ -6,15 +6,17 @@ packages: - libfftw3-dev - ladspa-sdk - vamp-plugin-sdk + - meson + - ninja-build sources: - hg+https://hg.sr.ht/~breakfastquay/rubberband tasks: - setup: | cd rubberband - ./configure + meson build - build: | cd rubberband - make + ninja -C build triggers: - action: email condition: always diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 11e4a96..0000000 --- a/.travis.yml +++ /dev/null @@ -1,27 +0,0 @@ -dist: - - trusty - -language: - - cpp - -sudo: - - false - -os: - - osx - -cache: - directories: - - $HOME/Library/Caches/Homebrew - - /usr/local/Homebrew - -before_cache: - - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew cleanup; fi - - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then find /usr/local/Homebrew \! -regex ".+\.git.+" -delete; fi - -before_install: - - if [[ "$TRAVIS_OS_NAME" = "osx" ]] ; then brew update ; brew install libsndfile ; fi - -script: - - if [[ "$TRAVIS_OS_NAME" = "osx" ]] ; then make -f Makefile.macos && make -f Makefile.ios clean && make -f Makefile.ios ; else ./configure && make ; fi - diff --git a/meson.build b/meson.build index 6a25029..5bd44ef 100644 --- a/meson.build +++ b/meson.build @@ -10,7 +10,7 @@ project( 'b_ndebug=if-release', 'b_lundef=true', ], - meson_version: '>= 0.54.0' + meson_version: '>= 0.53.0' ) rubberband_dynamic_library_version = '2.1.2'