diff options
| author | Josh Suereth <joshua.suereth@gmail.com> | 2012-09-12 12:14:33 -0400 |
|---|---|---|
| committer | Josh Suereth <joshua.suereth@gmail.com> | 2012-09-13 10:02:57 -0400 |
| commit | e5e62f1e78e59e91b48d1584627f4591efbfae49 (patch) | |
| tree | fcca738ad3914857dff8cd14949efdb2b09a97c6 /tools | |
| parent | 33ba866fd22a4a5542ae5e4dae8de8bf8d8ab2aa (diff) | |
| download | scala-e5e62f1e78e59e91b48d1584627f4591efbfae49.tar.gz scala-e5e62f1e78e59e91b48d1584627f4591efbfae49.tar.bz2 scala-e5e62f1e78e59e91b48d1584627f4591efbfae49.zip | |
Fixes binary repo push for new typesafe repo layouts.
This adds a new/fixed push.jar and adapts the binary-repo-lib script to use different URLs
for pulling than pushing.
This also adjustst the script to attempt the backup repo in case new artifacts haven't
synched to the fast/stable repository.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/binary-repo-lib.sh | 15 | ||||
| -rw-r--r-- | tools/push.jar.desired.sha1 | 2 |
2 files changed, 10 insertions, 7 deletions
diff --git a/tools/binary-repo-lib.sh b/tools/binary-repo-lib.sh index 64f62a103d..d43f3c8bff 100755 --- a/tools/binary-repo-lib.sh +++ b/tools/binary-repo-lib.sh @@ -3,7 +3,8 @@ # Library to push and pull binary artifacts from a remote repository using CURL. -remote_urlbase="http://typesafe.artifactoryonline.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap" +remote_urlget="http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap" +remote_urlpush="http://typesafe.artifactoryonline.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap" libraryJar="$(pwd)/lib/scala-library.jar" desired_ext=".desired.sha1" push_jar="$(pwd)/tools/push.jar" @@ -35,8 +36,8 @@ curlUpload() { local data=$2 local user=$3 local password=$4 - local url="${remote_urlbase}/${remote_location}" - java -jar $push_jar "$data" "$remote_location" "$user" "$password" + local url="${remote_urlpush}/${remote_location}" + java -jar $push_jar "$data" "$url" "$user" "$password" if (( $? != 0 )); then echo "Error uploading $data to $url" echo "$url" @@ -77,7 +78,7 @@ pushJarFile() { pushd $jar_dir >/dev/null local version=$(makeJarSha $jar_name) local remote_uri=${version}${jar#$basedir} - echo " Pushing to ${remote_urlbase}/${remote_uri} ..." + echo " Pushing to ${remote_urlpush}/${remote_uri} ..." echo " $curl" curlUpload $remote_uri $jar_name $user $pw echo " Making new sha1 file ...." @@ -136,7 +137,7 @@ pushJarFiles() { local user=$2 local password=$3 # TODO - ignore target/ and build/ - local jarFiles="$(find ${basedir}/lib -name "*.jar") $(find ${basedir}/test/files -name "*.jar")" + local jarFiles="$(find ${basedir}/lib -name "*.jar") $(find ${basedir}/test/files -name "*.jar") $(find ${basedir}/tools -name "*.jar")" local changed="no" for jar in $jarFiles; do local valid=$(isJarFileValid $jar) @@ -188,7 +189,9 @@ pullJarFileToCache() { rm -f "$cache_loc" fi if [[ ! -f "$cache_loc" ]]; then - curlDownload $cache_loc ${remote_urlbase}/${uri} + # Note: After we follow up with JFrog, we should check the more stable raw file server first + # before hitting the more flaky artifactory. + curlDownload $cache_loc ${remote_urlpush}/${uri} if test "$(checkJarSha "$cache_loc" "$sha")" != "OK"; then echo "Trouble downloading $uri. Please try pull-binary-libs again when your internet connection is stable." exit 2 diff --git a/tools/push.jar.desired.sha1 b/tools/push.jar.desired.sha1 index 53d566f525..63e6a47372 100644 --- a/tools/push.jar.desired.sha1 +++ b/tools/push.jar.desired.sha1 @@ -1 +1 @@ -de5d3eb21a732e4bce44c283ccfbd1ed94bfeaed ?push.jar +a1883f4304d5aa65e1f6ee6aad5900c62dd81079 ?push.jar |