Skip to content

Commit

Permalink
Fix travis build. Upd runner script
Browse files Browse the repository at this point in the history
  • Loading branch information
mikessh committed Feb 13, 2017
1 parent e228d28 commit de52be5
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jdk: oraclejdk8
install:
- git clone https://github.com/mikessh/vdjtools.git
- cd vdjtools/
- git checkout tags/1.1.2-SNAPSHOT
- git checkout tags/1.1.3
- mvn clean install -q -Dmaven.test.skip=true
- cd ..

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ VDJdb: A software for functional annotation of immune repertoires
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2015 Mikhail Shugay
Copyright 2015-2017 Mikhail Shugay

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ dependencies {
compile 'org.codehaus.gpars:gpars:1.0.0'
compile 'junit:junit:4.12'
compile 'com.milaboratory:milib:1.0'
compile 'com.antigenomics:vdjtools:1.1.2'
compile 'com.antigenomics:vdjtools:1.1.3'
compile 'com.fasterxml.jackson.core:jackson-core:2.7.1'
compile 'org.apache.ant:ant:1.9.4'
}
4 changes: 2 additions & 2 deletions vdjdb
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ case $os in
dir=$(dirname "$(readlinkUniversal "$0")")
;;
Linux)
rFreeMb=$(free -m | head -n 3 | tail -n 1 | awk '{ print $4 }')
rFreeMb=$(free -m | grep Mem | awk '{ print $4 }')
maxMb=$(($rFreeMb-$delta))
dir="$(dirname "$(readlink -f "$0")")"
;;
Expand Down Expand Up @@ -116,7 +116,7 @@ jar=""

if [[ -z "$otherJar" ]];
then
for j in "$dir/../jar/vdjdb.jar" "$dir/vdjdb.jar" $(ls -d -1 $dir/target/* 2> /dev/null | grep distribution.jar)
for j in "$dir/../jar/vdjdb-1.1.5.jar" "$dir/vdjdb-1.1.5.jar" $(ls -d -1 $dir/target/* 2> /dev/null | grep distribution.jar)
do
if [[ -e "$j" ]];
then
Expand Down

0 comments on commit de52be5

Please sign in to comment.