diff options
| author | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2015-05-21 17:01:43 +0200 |
|---|---|---|
| committer | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2015-05-21 17:01:43 +0200 |
| commit | ccbbe261b7ba2d41b01ca1df1d4655e07086b088 (patch) | |
| tree | ba6c2c4bd9283dd056b9c988e49569800c19d4ae /scripts | |
| parent | 4bac1a5fe9fcb0e0154c670fe766b3ea0faee814 (diff) | |
| download | dotty-ccbbe261b7ba2d41b01ca1df1d4655e07086b088.tar.gz dotty-ccbbe261b7ba2d41b01ca1df1d4655e07086b088.tar.bz2 dotty-ccbbe261b7ba2d41b01ca1df1d4655e07086b088.zip | |
Clone scala/scala to ./scala-scala instead of ./scala
Otherwise Intellij stops running JUnit tests correctly. No idea why.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/common | 6 | ||||
| -rwxr-xr-x | scripts/jobs/validate/junit | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/common b/scripts/common index 1c7be04f2..9ebfb8197 100755 --- a/scripts/common +++ b/scripts/common @@ -2,12 +2,12 @@ update() { [[ -d $baseDir ]] || mkdir -p $baseDir cd $baseDir - if [ ! -d $baseDir/$2 ]; then git clone "https://github.com/$1/$2.git"; fi + if [ ! -d $baseDir/$3 ]; then git clone "https://github.com/$1/$2.git" $3; fi - cd $2 + cd $3 git fetch --tags "https://github.com/$1/$2.git" - (git fetch "https://github.com/$1/$2.git" $3 && git checkout -fq FETCH_HEAD) #|| git checkout -fq $3 # || fallback is for local testing on tag + (git fetch "https://github.com/$1/$2.git" $4 && git checkout -fq FETCH_HEAD) #|| git checkout -fq $4 # || fallback is for local testing on tag git reset --hard } diff --git a/scripts/jobs/validate/junit b/scripts/jobs/validate/junit index 9748c3f5f..36078c170 100755 --- a/scripts/jobs/validate/junit +++ b/scripts/jobs/validate/junit @@ -4,5 +4,5 @@ baseDir=${WORKSPACE-`pwd`} scriptsDir="$baseDir/scripts" . $scriptsDir/common -update scala scala +update scala scala scala-scala sbt $sbtArgs update compile test |