summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Paquet <olivier.paquet@gmail.com>2017-12-01 14:16:01 +0000
committerOlivier Paquet <olivier.paquet@gmail.com>2017-12-01 14:16:01 +0000
commite000ac8aa5b51e40376cb5f0a3cb12eedd2430b4 (patch)
treef519d01d50fcce6107b0b77ed487d178599f97bf
parent311335ea46f890e7aaa0c366251c2d1afe901c69 (diff)
parentb02973f1bf5360552417dc15dbc0e5e3d45d339b (diff)
downloadlibtiff-git-e000ac8aa5b51e40376cb5f0a3cb12eedd2430b4.tar.gz
Merge branch 'makedistcheck' into 'master'
build/gitlab-ci and build/travis-ci: add a 'make dist' step in autoconf_build()… See merge request libtiff/libtiff!4
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--.travis.yml1
-rw-r--r--build/gitlab-ci1
-rw-r--r--build/travis-ci1
4 files changed, 4 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fbb7724e..606948e4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
image: ubuntu:16.04
before_script:
- - apt-get update -qq && apt-get install -y -qq autoconf automake build-essential cmake libtool libjpeg8-dev libjbig-dev liblzma-dev ninja-build zlib1g-dev
+ - apt-get update -qq && apt-get install -y -qq autoconf automake build-essential cmake libtool libjpeg8-dev libjbig-dev liblzma-dev ninja-build zlib1g-dev zip
stages:
- build
diff --git a/.travis.yml b/.travis.yml
index 96d262e7..ccb15be6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ addons:
- libjbig-dev
- liblzma-dev
- zlib1g-dev
+ - zip
os:
- linux
diff --git a/build/gitlab-ci b/build/gitlab-ci
index 25b3b92f..1370caec 100644
--- a/build/gitlab-ci
+++ b/build/gitlab-ci
@@ -17,6 +17,7 @@ autoconf_build()
make
make install
make check
+ make distcheck
}
# Test autoconf build
diff --git a/build/travis-ci b/build/travis-ci
index 18ef90a5..b1919c0a 100644
--- a/build/travis-ci
+++ b/build/travis-ci
@@ -17,6 +17,7 @@ autoconf_build()
make
make install
make check
+ make distcheck
}
# Install needed tools