diff --git a/.travis.yml b/.travis.yml index e818772e4..1503edbf4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,5 @@ before_script: - docker build -t fwupd-debian-experimental -f contrib/ci/Dockerfile-debian-experimental . script: - - docker run -t -v `pwd`:/build fwupd-fedora-25 ./contrib/ci/build_and_test.sh - - docker run -t -v `pwd`:/build fwupd-debian-experimental ./contrib/ci/build_and_test.sh - docker run -t -v `pwd`:/build fwupd-fedora-25 ./contrib/ci/build_and_install_rpms.sh - docker run -t -v `pwd`:/build fwupd-debian-experimental ./contrib/ci/build_and_install_debs.sh diff --git a/contrib/ci/build_and_test.sh b/contrib/ci/build_and_test.sh deleted file mode 100755 index 775f42e32..000000000 --- a/contrib/ci/build_and_test.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -set -e - -mkdir -p build && cd build -rm * -rf -meson .. \ - -Denable-doc=true \ - -Denable-man=true \ - -Denable-tests=true \ - -Denable-thunderbolt=false \ - -Denable-uefi=true \ - -Denable-dell=true \ - -Denable-synaptics=true \ - -Denable-colorhug=true $@ -ninja -v -ninja test -v -DESTDIR=/tmp/install-ninja ninja install -cd ..