From 0ff9d5307ba884e40430e295b1f76c59cca1d34d Mon Sep 17 00:00:00 2001 From: Mario Limonciello Date: Tue, 13 Jun 2017 14:17:49 -0500 Subject: [PATCH] drop travis CI generic build and test case (it's implied by testing packaging) --- .travis.yml | 2 -- contrib/ci/build_and_test.sh | 18 ------------------ 2 files changed, 20 deletions(-) delete mode 100755 contrib/ci/build_and_test.sh 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 ..