diff options
| author | Tristan Gingold <tgingold@free.fr> | 2017-08-17 08:09:45 +0200 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2017-08-17 08:09:45 +0200 |
| commit | 61df1ef50e0523d3838dcdc1e4784387666c7c69 (patch) | |
| tree | 4ea6dd90fc2aecb6de8248be8eacc9fe4af7a8a2 | |
| parent | 8b18c354be419a2d3022a70d763fc7a5470fea44 (diff) | |
| download | ghdl-61df1ef50e0523d3838dcdc1e4784387666c7c69.tar.gz ghdl-61df1ef50e0523d3838dcdc1e4784387666c7c69.tar.bz2 ghdl-61df1ef50e0523d3838dcdc1e4784387666c7c69.zip | |
travis-ci: fix fold (again?) and macos-x
| -rwxr-xr-x | dist/linux/travis-ci.sh | 4 | ||||
| -rwxr-xr-x | dist/macosx/install-ada.sh | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/dist/linux/travis-ci.sh b/dist/linux/travis-ci.sh index 55f30d270..89fa4585e 100755 --- a/dist/linux/travis-ci.sh +++ b/dist/linux/travis-ci.sh @@ -81,10 +81,10 @@ EXITCODE=0; t=0; for b in $blds; do workdir="../wrk-$t" # Display log (with travis log folding commands) + echo -en "travis_fold:start:log.$t\r" printf "$ANSI_YELLOW[TRAVIS] Print BUILD $t log $ANSI_NOCOLOR\n" - echo "travis_fold:start:log.$t" cat $workdir/log.log - echo "travis_fold:end:log.$t" + echo -en "travis_fold:end:log.$t\r" # Read the last line of the log RESULT="$(tail -1 $workdir/log.log)" diff --git a/dist/macosx/install-ada.sh b/dist/macosx/install-ada.sh index eb1d2607f..bd30e2e1b 100755 --- a/dist/macosx/install-ada.sh +++ b/dist/macosx/install-ada.sh @@ -7,15 +7,17 @@ if [ -e gnat/etc/install_ok ]; then exit 0 fi +echo "Download and install gnat-gpl" + # Download from libre.adacore.com tarfile=gnat-gpl-2017-x86_64-darwin-bin.tar.gz -#curl -o $tarfile http://mirrors.cdn.adacore.com/art/591c9045c7a447af2deed24e +curl -o $tarfile http://mirrors.cdn.adacore.com/art/591c9045c7a447af2deed24e # un tar -#tar xf $tarfile +tar xf $tarfile # Direct install -#mv gnat-gpl-2017-x86_64-darwin-bin gnat +mv gnat-gpl-2017-x86_64-darwin-bin gnat # Cleanup: remove components not needed rm -rf gnat/share/{themes,icons} |