aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Gingold <tgingold@free.fr>2016-05-03 05:18:35 +0200
committerTristan Gingold <tgingold@free.fr>2016-05-03 05:18:35 +0200
commit4042828959784d24bc7e8d89e468a65d3866e35e (patch)
tree39361e51d1604213fccf12ef8132f2b8781651b5
parentce1e1a2a8a5c3233d57af824cd65272c7493dd69 (diff)
downloadghdl-4042828959784d24bc7e8d89e468a65d3866e35e.tar.gz
ghdl-4042828959784d24bc7e8d89e468a65d3866e35e.tar.bz2
ghdl-4042828959784d24bc7e8d89e468a65d3866e35e.zip
travis: adjust script and config
-rw-r--r--.travis.yml3
-rwxr-xr-xdist/travis-ci.sh6
2 files changed, 7 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 8c980060b..56448e325 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,4 +24,5 @@ deploy:
secure: k1Idw3l/35mms1mESpO+5TmA2Kmf0UlMsxjgQiWikYu6va6icJjTzCHv6d3YjF6tzkouZZa74Gep22gg46uDWU6wtcBYq5X2IxEX1U3iRxi5CNXL77ZaYdj9Nn69cNImjGPqigJMJLOuIPi31ENlxgO83U07VYE1cV603+spvxw3a1TynrBIjdugiVMIFctrmt/zTIt/jBG1oQNLPdVTRFavnjpsFlnIcO5DvHvKxoDEpF3WwPcDr6h/bmnFZSfr8Sr2pptQU1S6qtHaLJPwg8w1f93nxr1LEK2MR8eVfS5XSEVC8nBZJHksdlwx/iiGyWEqEeXLXpoaHAO3aqkhjsMA1+mKbwtHjT7WBNWorKfmQP3ZTShhksPa+oBFitC33gXGCNCFMWSVdXrTIKIN8m//KSc3VTbxHL10afO9lCD955bZi1cpFZiE471BBXDxpN9Nv+1tV7RO7e6gm+94n9CYYkdCHcFK4hj0gGXDOQlUEEmZj4vAiwaDWfByfHxDNClT3rJ8tAm9BFjdDOI54NlA15/nyx+00Kw0FEZqvIemeMsCpz4Ril2bL8BZtwYm8e5sygqgdGODtRT5Q0hbHO2fuMpth4gvGGHraGlmH1Rez5BSnUsWVSQxV4Z+9/VZtQOK6HdfbbB8dd9SlOuEN1M9EqqEHBxdvHBkoMZy1uk=
file: "ghdl-*-$BLD-*.tgz"
on:
- tags
+ tags: true
+ all_branches: true
diff --git a/dist/travis-ci.sh b/dist/travis-ci.sh
index 56b4b1972..d2ca5787e 100755
--- a/dist/travis-ci.sh
+++ b/dist/travis-ci.sh
@@ -7,6 +7,10 @@ set -e
CDIR=$PWD
BLD=$1
+# Display environment
+echo "Environment:"
+env
+
# Prepare
prefix="$CDIR/install-$BLD"
mkdir "$prefix"
@@ -35,7 +39,7 @@ cd ..
# Package
PKG_VER=`grep Ghdl_Ver src/version.ads | sed -e 's/.*"\(.*\)";/\1/'`
-if [ "$TRAVIS_TAG" = "x" ]; then
+if [ "$TRAVIS_TAG" = "" ]; then
PKG_TAG=`date -u +%Y%m%d`
else
PKG_TAG=$TRAVIS_TAG