aboutsummaryrefslogtreecommitdiffstats
path: root/dist/travis
diff options
context:
space:
mode:
author1138-4EB <1138-4EB@users.noreply.github.com>2019-02-03 23:55:49 +0100
committertgingold <tgingold@users.noreply.github.com>2019-02-04 08:01:53 +0100
commitb324bb655714e50832009b99987f37cb87b15902 (patch)
tree2d37a1ecbe936613c54fe0d0937bfd09ae804718 /dist/travis
parent2b6d8f5aac1ae616a73c867b40068eb2dceda76c (diff)
downloadghdl-b324bb655714e50832009b99987f37cb87b15902.tar.gz
ghdl-b324bb655714e50832009b99987f37cb87b15902.tar.bz2
ghdl-b324bb655714e50832009b99987f37cb87b15902.zip
style: install-ada
Diffstat (limited to 'dist/travis')
-rwxr-xr-xdist/travis/travis-ci.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/dist/travis/travis-ci.sh b/dist/travis/travis-ci.sh
index 0dda09931..e9e419c66 100755
--- a/dist/travis/travis-ci.sh
+++ b/dist/travis/travis-ci.sh
@@ -50,6 +50,11 @@ echo "travis_fold:start:fetch"
git fetch --unshallow || true
echo "travis_fold:end:fetch"
+if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+ # Install gnat compiler (use cache)
+ ./dist/macosx/install-ada.sh || exit 1
+ PATH=$PWD/gnat/bin:$PATH
+fi
# Compute package name
@@ -86,10 +91,6 @@ echo "build cmd: $BUILD_CMD_OPTS"
# Build
if [ "$TRAVIS_OS_NAME" = "osx" ]; then
- # Install gnat compiler (use cache)
- ./dist/macosx/install-ada.sh || exit 1
- PATH=$PWD/gnat/bin:$PATH
-
bash -c "${scriptdir}/build.sh $BUILD_CMD_OPTS"
else
# Assume linux