travis tuning

diff --git a/.travis.yml b/.travis.yml
index d1cca2afa18a59642b240a537b35abcc83668771..3b987eb239215d15f2ffb891f368e9792e54fc39 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,6 @@ install:
 script:
     - ci/build-2-install.sh
     - prove ci/test-*.pl
-    - make dist
     - ci/test-tarball.sh
 after_success:
     - ci/deploy-bintray.sh

diff --git a/ci/deploy-bintray.sh b/ci/deploy-bintray.sh
index c693baec1e6e9198e332d71b48b15819239ee767..9c535a3a901474ddcc85015cca0f50286b707b19 100755 (executable)
--- a/ci/deploy-bintray.sh
+++ b/ci/deploy-bintray.sh
@@ -4,7 +4,6 @@
 
 set -e
 
-make dist
 VERSION=$(ls fping-*.tar.gz | sed -e 's/^fping-//' | sed -e 's/\.tar\.gz$//')
 if [[ "$VERSION" =~ ^[0-9]+\.[0-9]+$ ]]; then
     REPO=release

diff --git a/ci/test-tarball.sh b/ci/test-tarball.sh
index efb8fbede4b61ea7d2f7fca1b02427dedc2fabea..0f6c2d4e3492c663bf339b62a5cb044a906a4c10 100755 (executable)
--- a/ci/test-tarball.sh
+++ b/ci/test-tarball.sh
@@ -6,8 +6,9 @@
 set -e
 set -x
 
-TARFILE=fping-*.tar.gz
-if [ ! -f "$TARFILE" ]; then
+make dist
+VERSION=$(ls fping-*.tar.gz | sed -e 's/^fping-//' | sed -e 's/\.tar\.gz$//')
+if [ -z "$VERSION" ]; then
     echo "tar.gz file not found." >&2
     exit 1
 fi
@@ -15,7 +16,7 @@ fi
 # unarchive
 TMPDIR=$(mktemp -d --tmpdir=.)
 cd $TMPDIR
-tar xf ../$TARFILE
+tar xf ../fping-$VERSION.tar.gz
 DIRNAME=$(ls)
 
 # build