Skip to content

New repo for integration builds #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 7, 2017
Merged

New repo for integration builds #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8850a5c
new repo for integration builds
lrytz Mar 3, 2017
0e0f44e
identify new integration release numbers
lrytz Mar 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion conf/repositories
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
2 changes: 1 addition & 1 deletion scripts/jobs/release/website/archives
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/jobs/release/website/update-api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down