diff options
| author | Dmitry Petrashko <dark@d-d.me> | 2015-05-22 13:16:20 +0200 |
|---|---|---|
| committer | Dmitry Petrashko <dark@d-d.me> | 2015-05-22 13:16:20 +0200 |
| commit | 4f27848d63bd388caeea86c032c85ecc2c5d31fe (patch) | |
| tree | c9675974004dbe1c6ce16631f3eabeee129caa3a /scripts | |
| parent | 76c639283934faef5d3a9fd86bbaa6417aa2c8b2 (diff) | |
| parent | ccbbe261b7ba2d41b01ca1df1d4655e07086b088 (diff) | |
| download | dotty-4f27848d63bd388caeea86c032c85ecc2c5d31fe.tar.gz dotty-4f27848d63bd388caeea86c032c85ecc2c5d31fe.tar.bz2 dotty-4f27848d63bd388caeea86c032c85ecc2c5d31fe.zip | |
Merge pull request #593 from dotty-staging/fix-intellij
Clone scala/scala to ./scala-scala instead of ./scala
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 6386ab2f5..50b13f8d7 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 |