Do tests on appveyor and merge builds on travis

.appveyor.yml

@@ -48,7 +48,7 @@ for:
   cache: c:\tools\vcpkg\installed\ -> appveyor.yml
   install:      call %APPVEYOR_BUILD_FOLDER%\scripts\appveyor\install.cmd
   before_build: call %APPVEYOR_BUILD_FOLDER%\scripts\appveyor\before_build.cmd
-  build_script: cmake --build . --config Release -j2
+  build_script: call %APPVEYOR_BUILD_FOLDER%\scripts\appveyor\build.cmd
   after_build:  call %APPVEYOR_BUILD_FOLDER%\scripts\appveyor\after_build.cmd
   artifacts:
   - name: x86 Setup
@@ -60,7 +60,7 @@ for:
   cache: c:\tools\vcpkg\installed\ -> appveyor.yml
   install:      call %APPVEYOR_BUILD_FOLDER%\scripts\appveyor\install.cmd
   before_build: call %APPVEYOR_BUILD_FOLDER%\scripts\appveyor\before_build.cmd
-  build_script: cmake --build . --config Release -j2
+  build_script: call %APPVEYOR_BUILD_FOLDER%\scripts\appveyor\build.cmd
   after_build:  call %APPVEYOR_BUILD_FOLDER%\scripts\appveyor\after_build.cmd
   artifacts:
   - name: x64 Setup

.travis.yml

@@ -19,17 +19,26 @@ jobs:
     install: .travis/download_vst_sdk.sh
     script: scripts/run_clang_tidy.sh
 
-  - name: "Linux amd64 tests"
+  - name: "Linux amd64 test and build"
     arch: amd64
     addons:
       apt:
         packages:
         - libjack-jackd2-dev
         - libsndfile1-dev
+        - libcairo2-dev
+        - libfontconfig1-dev
+        - libx11-xcb-dev
+        - libxcb-util-dev
+        - libxcb-cursor-dev
+        - libxcb-xkb-dev
+        - libxkbcommon-dev
+        - libxkbcommon-x11-dev
+        - libxcb-keysyms1-dev
     install: .travis/download_cmake.sh
-    script: .travis/script_test.sh
+    script: .travis/script_test_and_build.sh
 
-  - name: "Linux arm64 tests"
+  - name: "Linux arm64 test and build"
     arch: arm64-graviton2
     group: edge
     virt: lxd
@@ -38,8 +47,17 @@ jobs:
         packages:
         - libjack-jackd2-dev
         - libsndfile1-dev
+        - libcairo2-dev
+        - libfontconfig1-dev
+        - libx11-xcb-dev
+        - libxcb-util-dev
+        - libxcb-cursor-dev
+        - libxcb-xkb-dev
+        - libxkbcommon-dev
+        - libxkbcommon-x11-dev
+        - libxcb-keysyms1-dev
     install: .travis/download_cmake.sh
-    script: .travis/script_test.sh
+    script: .travis/script_test_and_build.sh
 
   - name: "MOD devices arm"
     env:
@@ -72,34 +90,6 @@ jobs:
     script: .travis/script_mingw.sh
     after_success: .travis/prepare_tarball.sh
 
-  - name: "Linux amd64 library"
-    arch: amd64
-    env:
-    - INSTALL_DIR="sfizz-${TRAVIS_BRANCH}-${TRAVIS_OS_NAME}-${TRAVIS_CPU_ARCH}"
-    addons:
-      apt:
-        packages:
-        - libjack-jackd2-dev
-        - libsndfile1-dev
-    install: .travis/download_cmake.sh
-    script: .travis/script_library.sh
-    after_success: .travis/prepare_tarball.sh
-
-  - name: "Linux arm64 library"
-    arch: arm64-graviton2
-    group: edge
-    virt: lxd
-    env:
-    - INSTALL_DIR="sfizz-${TRAVIS_BRANCH}-${TRAVIS_OS_NAME}-${TRAVIS_CPU_ARCH}"
-    addons:
-      apt:
-        packages:
-        - libjack-jackd2-dev
-        - libsndfile1-dev
-    install: .travis/download_cmake.sh
-    script: .travis/script_library.sh
-    after_success: .travis/prepare_tarball.sh
-
   - name: "Linux arm64 static plugins"
     arch: arm64-graviton2
     group: edge

.travis/script_test_and_build.sh

@@ -3,12 +3,19 @@ set -ex
 
 mkdir build && cd build
 cmake -DCMAKE_BUILD_TYPE=Release \
-      -DSFIZZ_JACK=OFF \
+      -DSFIZZ_JACK=ON \
+      -DSFIZZ_VST=ON \
+      -DSFIZZ_LV2_UI=ON \
       -DSFIZZ_TESTS=ON \
       -DSFIZZ_SHARED=OFF \
       -DSFIZZ_STATIC_DEPENDENCIES=OFF \
-      -DSFIZZ_LV2=OFF \
+      -DSFIZZ_LV2=ON \
       -DCMAKE_CXX_STANDARD=17 \
       ..
 make -j2 sfizz_tests
 tests/sfizz_tests
+make -j2 sfizz_jack
+make -j2 sfizz_render
+make -j2 sfizz_lv2
+make -j2 sfizz_lv2_ui
+make -j2 sfizz_vst3

scripts/appveyor/build.cmd

@@ -0,0 +1,5 @@
+cmake --build . --target sfizz_tests --config Release -j2
+.\tests\Release\sfizz_tests.exe
+cmake --build . --target sfizz_lv2 --config Release -j2
+cmake --build . --target sfizz_lv2_ui --config Release -j2
+cmake --build . --target sfizz_vst3 --config Release -j2