diff --git a/.github/workflows/github-travis.yml b/.github/workflows/github-travis.yml index 61d7cf2edd..49bc6555c2 100644 --- a/.github/workflows/github-travis.yml +++ b/.github/workflows/github-travis.yml @@ -18,12 +18,14 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 15 + + - name: Set up Adopt OpenJDK 15 uses: actions/setup-java@v2 with: distribution: 'adopt' java-version: '15' java-package: jdk + - name: Prepare build run: | echo "MAVEN_OPTS='-Dorg.slf4j.simpleLogger.defaultLogLevel=error -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Xmx2048m'" >> ~/.mavenrc diff --git a/travis/validate_and_test.sh b/travis/validate_and_test.sh index 24bf0c5042..ef92157ea9 100755 --- a/travis/validate_and_test.sh +++ b/travis/validate_and_test.sh @@ -6,33 +6,16 @@ if [[ $MESSAGE == *"ci notest"* ]]; then exit 0 else - cd $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/linux/gtk/x86_64/headless - memory=3048m - - - - DUMPLIST=$(ls ../plugins/*.jar ) - - for fic in $DUMPLIST; do - GAMA=$GAMA:$fic - done - - passWork=.work - - echo "GAMA is starting..." - #exec - - #GAMA=Gamaq - # Run -validate or cat log file and close - java -cp $GAMA -Xms512m -Xmx$memory -Djava.awt.headless=true org.eclipse.core.launcher.Main -application msi.gama.headless.id4 -data $passWork -validate || cat $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/linux/gtk/x86_64/headless/.work/.metadata/.log && exit 125 + echo "GAMA validate is starting..." + bash $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/linux/gtk/x86_64/headless/gama-headless.sh -m 3048m -validate res=$? if [[ $res -gt 0 ]]; then rm -rf $passWork exit $res fi - echo "GAMA is starting..." - java -cp $GAMA -Xms512m -Xmx$memory -Djava.awt.headless=true org.eclipse.core.launcher.Main -application msi.gama.headless.id4 -data $passWork -test -failed || cat $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/linux/gtk/x86_64/headless/.work/.metadata/.log && exit 125 + echo "GAMA test is starting..." + bash $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/linux/gtk/x86_64/headless/gama-headless.sh -m 3048m -test -failed res=$? if [[ $res -gt 0 ]]; then rm -rf $passWork