diff --git a/conf/repositories b/conf/repositories index e3767f702..be74e9ba9 100644 --- a/conf/repositories +++ b/conf/repositories @@ -1,5 +1,5 @@ [repositories] - private-repo: https://scala-ci.typesafe.com/artifactory/scala-release-temp/ + scala-integration: https://scala-ci.typesafe.com/artifactory/scala-integration/ jcenter-cache: https://scala-ci.typesafe.com/artifactory/jcenter/ typesafe-ivy-releases: https://repo.lightbend.com/typesafe/ivy-releases/, [organisation]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly sbt-plugin-releases: https://repo.scala-sbt.org/scalasbt/sbt-plugin-releases/, [organisation]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext] diff --git a/scripts/jobs/release/website/archives b/scripts/jobs/release/website/archives index 7166182e8..870c6f30b 100755 --- a/scripts/jobs/release/website/archives +++ b/scripts/jobs/release/website/archives @@ -4,7 +4,7 @@ declare -a sshCharaArgs="$sshCharaArgs" url="http://downloads.lightbend.com/scala/$version" -if [[ "$version" =~ .*-nightly ]] +if [[ "$version" =~ ^.*-(bin|pre)-[0-9a-f]+$ ]] then archivesDir="~linuxsoft/archives/scala/nightly/2.12.x" else archivesDir="~linuxsoft/archives/scala" fi diff --git a/scripts/jobs/release/website/update-api b/scripts/jobs/release/website/update-api index 9e0dfcaa0..5241f0d26 100755 --- a/scripts/jobs/release/website/update-api +++ b/scripts/jobs/release/website/update-api @@ -2,7 +2,7 @@ # need to re-declare it as an array, not sure how to do that directly in jenkins declare -a sshCharaArgs="$sshCharaArgs" -if [[ "$version" =~ .*-nightly ]] +if [[ "$version" =~ ^.*-(bin|pre)-[0-9a-f]+$ ]] then archivesDir="~linuxsoft/archives/scala/nightly/2.12.x" else archivesDir="~linuxsoft/archives/scala" fi