aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Gingold <tgingold@free.fr>2017-08-17 05:53:33 +0200
committerTristan Gingold <tgingold@free.fr>2017-08-17 05:53:33 +0200
commit16229d80d577d320a600b32f67f4767d763dfc4d (patch)
tree1cf05144eb5601c40924e1ba84b50fa1d0a28692
parent55112f70bfffd79e97a68f6663131ad7405c3a95 (diff)
downloadghdl-16229d80d577d320a600b32f67f4767d763dfc4d.tar.gz
ghdl-16229d80d577d320a600b32f67f4767d763dfc4d.tar.bz2
ghdl-16229d80d577d320a600b32f67f4767d763dfc4d.zip
travis: remove script deploy, adjust fold.
-rw-r--r--.travis.yml4
-rwxr-xr-xdist/linux/travis-ci.sh4
2 files changed, 3 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index da55c31d2..aef289aaa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ matrix:
sudo: required
services: docker
- os: osx
- osx_image: xcode7.2
+ osx_image: xcode7.3
install: true
@@ -32,8 +32,6 @@ deploy:
repo: tgingold/ghdl
tags: true
all_branches: true
- - provider: script
- script: /bin/true
after_deploy:
- "echo deployed"
diff --git a/dist/linux/travis-ci.sh b/dist/linux/travis-ci.sh
index 7fe6b6276..c79ef222b 100755
--- a/dist/linux/travis-ci.sh
+++ b/dist/linux/travis-ci.sh
@@ -76,9 +76,9 @@ t=0; for b in $blds; do
workdir="../wrk-$t"
# Display log (with travis log folding commands)
printf "$ANSI_YELLOW[TRAVIS] Print BUILD $t log $ANSI_NOCOLOR\n"
- echo "travis_fold:start:log-$t"
+ echo "travis_fold:start:log.$t"
cat $workdir/log.log
- echo "travis_fold:end:log-$t"
+ echo "travis_fold:end:log.$t"
# Read the last line of the log
RESULT="$(tail -1 $workdir/log.log)"