diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2016-11-29 13:01:17 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2016-11-29 13:01:17 +1000 |
commit | 8bde156900f8310d36b03c83452b534c5489daf9 (patch) | |
tree | 6e7136045f6a0bc445c84685d01594df3b90c665 /scripts | |
parent | 2bc92e0b2fa9f6de2b2a6c8f9ef4b85492e7df4d (diff) | |
parent | 74ed575a0f62c814595d159a8fd2290c04bcff5f (diff) | |
download | scala-8bde156900f8310d36b03c83452b534c5489daf9.tar.gz scala-8bde156900f8310d36b03c83452b534c5489daf9.tar.bz2 scala-8bde156900f8310d36b03c83452b534c5489daf9.zip |
Merge commit '74ed575' into topic/merge-2.11.x-to-2.12.x-20161129
Conflicts:
scripts/jobs/integrate/bootstrap
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/jobs/integrate/bootstrap | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/jobs/integrate/bootstrap b/scripts/jobs/integrate/bootstrap index ed1e05251a..7c045ae918 100755 --- a/scripts/jobs/integrate/bootstrap +++ b/scripts/jobs/integrate/bootstrap @@ -430,7 +430,7 @@ removeExistingBuilds() { local scalaLangModules=`curl -s $storageApiUrl/org/scala-lang | jq -r '.children | .[] | "org/scala-lang" + .uri' | grep -v actors-migration` for module in $scalaLangModules; do - local artifacts=`curl -s $storageApiUrl/$module | jq -r ".children | .[] | select(.uri | contains(\"$SCALA_VER\")) | .uri"` + local artifacts=`curl -s $storageApiUrl/$module | jq -r ".children | .[] | select(.uri | endswith(\"$SCALA_VER\")) | .uri"` for artifact in $artifacts; do echo "Deleting $releaseTempRepoUrl$module$artifact" curl -s --netrc-file $netrcFile -X DELETE $releaseTempRepoUrl$module$artifact |