1
0
mirror of https://github.com/MontFerret/ferret.git synced 2024-12-12 11:15:14 +02:00

Merge pull request #35 from krishnakarthik1309/travis-ci

fix travis-ci(#28): use shell script instead of aliases
This commit is contained in:
Tim Voronov 2018-10-04 10:32:44 -04:00 committed by GitHub
commit d92d97da89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions

View File

@ -17,9 +17,11 @@ addons:
- oracle-java8-set-default
before_install:
- shopt -s expand_aliases
- curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
- sudo curl -O https://www.antlr.org/download/antlr-4.7.1-complete.jar
- sudo curl -o /usr/local/lib/antlr-4.7.1-complete.jar https://www.antlr.org/download/antlr-4.7.1-complete.jar
- export CLASSPATH=".:/usr/local/lib/antlr-4.7.1-complete.jar:$CLASSPATH"
- alias antlr4='java -jar /usr/local/lib/antlr-4.7.1-complete.jar'
- alias grun='java org.antlr.v4.gui.TestRig'
- mkdir $HOME/travis-bin
- echo -e "#!/bin/bash\njava -jar /usr/local/lib/antlr-4.7.1-complete.jar" > $HOME/travis-bin/antlr4
- echo -e "#!/bin/bash\njava org.antlr.v4.gui.TestRig" > $HOME/travis-bin/grun
- chmod +x $HOME/travis-bin/*
- export PATH=$PATH:$HOME/travis-bin

View File

@ -215,6 +215,8 @@ func Parse(input interface{}) core.Value {
return obj
case []byte:
return NewBinary(input.([]byte))
case nil:
return None
default:
if core.IsNil(input) {
return None