diff options
| author | Hanspeter Portner <dev@open-music-kontrollers.ch> | 2018-05-17 21:16:25 +0200 |
|---|---|---|
| committer | Hanspeter Portner <dev@open-music-kontrollers.ch> | 2018-05-17 21:16:25 +0200 |
| commit | a4f7da9eb873a8fffca3b08be3abadbb41ae1163 (patch) | |
| tree | 7dd71ae7d1124e74773e899302e99e1d0bafac2c | |
| parent | c6c39426acbddcea7b35f0deb09369c6a6e7f71f (diff) | |
| download | varchunk-a4f7da9eb873a8fffca3b08be3abadbb41ae1163.tar.xz | |
remove travis CI recipe, fix gitlab CI recipe.
| -rw-r--r-- | .gitlab-ci.yml | 12 | ||||
| -rw-r--r-- | .travis.yml | 18 |
2 files changed, 8 insertions, 22 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2141c0a..03aa8f1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,19 +20,23 @@ stages: script: - meson --prefix=/ --cross-file "${TOOLCHAIN_FILE}" build - ninja -C build - - ninja -C test + +.test_template: &test_definition + <<: *build_definition + script: + - ninja -C build test .universal_linux_template: &universal_linux_definition image: ventosus/universal-linux-gnu - <<: *build_definition + <<: *test_definition .arm_linux_template: &arm_linux_definition image: ventosus/arm-linux-gnueabihf - <<: *build_definition + <<: *test_definition .universal_w64_template: &universal_w64_definition image: ventosus/universal-w64-mingw32 - <<: *build_definition + <<: *test_definition .universal_apple_template: &universal_apple_definition image: ventosus/universal-apple-darwin diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c775ce8..0000000 --- a/.travis.yml +++ /dev/null @@ -1,18 +0,0 @@ -language: c -os: linux -compiler: - - gcc - - clang -before_install: - - if [ "$CC" = "clang" ]; then sudo add-apt-repository -y ppa:h-rayflood/llvm-upper; fi - - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - - sudo apt-get -q update -install: - - if [ "$CC" = "clang" ]; then sudo apt-get install -y clang-3.6 libstdc++-5-dev; fi - - if [ "$CC" = "gcc" ]; then sudo apt-get install -y gcc-5 g++-5; fi -before_script: - - if [ "$CC" = "clang" ]; then export CXX="clang++-3.6" CC="clang-3.6" CFLAGS="-ffreestanding"; fi - - if [ "$CC" = "gcc" ]; then export CXX="g++-5" CC="gcc-5"; fi - - mkdir build && pushd build && cmake -DBUILD_TESTING=1 -DCMAKE_BUILD_TYPE=Debug .. && popd -script: - - pushd build && make && ARGS="-VV" make test && popd |