Skip to content

Commit

Permalink
Merge e7e7635 into 71ab0a3
Browse files Browse the repository at this point in the history
  • Loading branch information
smarr committed Jul 15, 2018
2 parents 71ab0a3 + e7e7635 commit e27efe5
Show file tree
Hide file tree
Showing 6 changed files with 96 additions and 145 deletions.
10 changes: 5 additions & 5 deletions .gitlab-ci.yml
Expand Up @@ -40,23 +40,23 @@ benchmark_savina_job:
allow_failure: true
script:
- ant -Dskip.graal=true compile
- export EXP=`if [[ "$CI_BUILD_REF_NAME" = "master" ]]; then echo "SOMns-Savina"; else echo "SOMns-Savina-exp"; fi`; rebench -d --without-nice -c --commit-id="$CI_BUILD_REF" --environment="Infinity Ubuntu" --project=SOMns-Savina --branch=master codespeed.conf $EXP
- export EXP=`if [[ "$CI_BUILD_REF_NAME" = "master" ]]; then echo "SOMns-Savina"; else echo "SOMns-Savina-exp"; fi`; rebench --without-nice -c --commit-id="$CI_BUILD_REF" --environment="`hostname` `cat /etc/issue | cut -d ' ' -f 1`" --project=SOMns-Savina --branch=master codespeed.conf $EXP

benchmark_job:
stage: benchmark
tags: [benchmarks, infinity]
allow_failure: true
script:
- ant -Dskip.graal=true compile
- export EXP=`if [[ "$CI_BUILD_REF_NAME" = "master" ]]; then echo "SOMns"; else echo "SOMns-exp"; fi`; rebench -d --without-nice -c --commit-id="$CI_BUILD_REF" --environment="Infinity Ubuntu" --project=SOMns --branch=master codespeed.conf $EXP
- export EXP=`if [[ "$CI_BUILD_REF_NAME" = "master" ]]; then echo "SOMns"; else echo "SOMns-exp"; fi`; rebench --without-nice -c --commit-id="$CI_BUILD_REF" --environment="`hostname` `cat /etc/issue | cut -d ' ' -f 1`" --project=SOMns --branch=master codespeed.conf $EXP

benchmark_interp_job:
stage: benchmark
tags: [benchmarks, infinity]
allow_failure: true
script:
- ant -Dskip.graal=true compile
- export EXP=`if [[ "$CI_BUILD_REF_NAME" = "master" ]]; then echo "SOMns-interp"; else echo "SOMns-interp-exp"; fi`; rebench -d --without-nice -c --commit-id="$CI_BUILD_REF" --environment="Infinity Ubuntu" --project=SOMns --branch=master codespeed.conf $EXP
- export EXP=`if [[ "$CI_BUILD_REF_NAME" = "master" ]]; then echo "SOMns-interp"; else echo "SOMns-interp-exp"; fi`; rebench --without-nice -c --commit-id="$CI_BUILD_REF" --environment="`hostname` `cat /etc/issue | cut -d ' ' -f 1`" --project=SOMns --branch=master codespeed.conf $EXP

benchmark_nightly_job:
stage: benchmark
Expand All @@ -66,5 +66,5 @@ benchmark_nightly_job:
- triggers
script:
- ant -Dskip.graal=true compile
- rebench -d --without-nice -c --commit-id="$CI_BUILD_REF" --environment="Infinity Ubuntu" --project=SOMns --branch=master codespeed.conf nightly
- rebench -d --without-nice -c --commit-id="$CI_BUILD_REF" --environment="Infinity Ubuntu" --project=SOMns --branch=master codespeed.conf SOMns-Savina-tracing
- rebench --without-nice -c --commit-id="$CI_BUILD_REF" --environment="`hostname` `cat /etc/issue | cut -d ' ' -f 1`" --project=SOMns --branch=master codespeed.conf nightly
- rebench --without-nice -c --commit-id="$CI_BUILD_REF" --environment="`hostname` `cat /etc/issue | cut -d ' ' -f 1`" --project=SOMns --branch=master codespeed.conf SOMns-Savina-tracing
4 changes: 2 additions & 2 deletions build.xml
Expand Up @@ -16,7 +16,7 @@
<property name="sdk.build" location="${sdk.dir}/mxbuild/dists" />
<property name="truffle.build" location="${truffle.dir}/mxbuild/dists" />
<property name="somns-deps.version" value="0.3.3" />
<property name="checkstyle.version" value="8.8" />
<property name="checkstyle.version" value="8.11" />
<property name="jacoco.version" value="0.8.0" />

<!-- <property name="lib.url" value="https://dl.bintray.com/smarr/SOM" /> -->
Expand Down Expand Up @@ -180,7 +180,7 @@
</target>

<target name="checkstyle-jar">
<get src="http://tenet.dl.sourceforge.net/project/checkstyle/checkstyle/${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar"
<get src="https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar"
usetimestamp="true"
dest="${lib.dir}/checkstyle-${checkstyle.version}-all.jar" />
</target>
Expand Down

0 comments on commit e27efe5

Please sign in to comment.