Skip to content

get run-locally script working again #10

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.

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
Dec 14, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
target
/sandbox
/ivy2
target/
/sandbox/
/ivy2/
1 change: 1 addition & 0 deletions project/build.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sbt.version=0.13.13
6 changes: 6 additions & 0 deletions repositories
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[repositories]
plugins: https://repo.scala-sbt.org/scalasbt/sbt-plugin-releases, [organisation]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext]
private-repo: https://scala-ci.typesafe.com/artifactory/scala-release-temp/
typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
maven-central
local
16 changes: 7 additions & 9 deletions run-locally
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,21 @@

scriptDir="$( cd "$( dirname "$0" )" && pwd )"

# put some recent nightly from https://scala-webapps.epfl.ch/jenkins/view/scala-release-2.11.x/job/scala-release-2.11.x/
version=2.11.2-854de2d-nightly
repositoriesFile=$scriptDir/../jenkins-scripts/repositories-scala-release

[[ -e $repositoriesFile ]] || {
echo "repos file does not exist $repositoriesFile"
exit 1
function latestNightly() {
>&2 echo "No Scala version specified. Using latest nightly."
url='https://scala-ci.typesafe.com/job/scala-2.12.x-integrate-bootstrap/lastSuccessfulBuild/artifact/jenkins.properties/*view*/'
curl -f -s -L $url | grep ^version= | cut -d= -f2
}

cat $repositoriesFile
export version=${version-`latestNightly`}
echo "Scala version:" $version

rm -rf $scriptDir/ivy2

sbt \
-Dsbt.log.noformat=true \
-Dsbt.ivy.home=$scriptDir/ivy2 \
-Dsbt.override.build.repos=true \
-Dsbt.repository.config=$repositoriesFile \
-Dsbt.repository.config=repositories \
-Dproject.version=$version \
clean run
2 changes: 1 addition & 1 deletion scripts/jobs/release/smoketest
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ rm -rf sandbox
mkdir sandbox
cd sandbox

url="http://downloads.typesafe.com/scala/$version"
url="http://downloads.lightbend.com/scala/$version"
wget -nv -O scala-$version.tgz $url/scala-$version.tgz
tar xzvf scala-$version.tgz

Expand Down
3 changes: 3 additions & 0 deletions src/main/scala/scaladist/Main.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package scaladist

import scala.util.Properties.versionString

object Main extends App {
println(s"scala.util.Properties.versionString: $versionString")
XmlTest.test()
SwingTest.test()
ParserCombinatorsTest.test()
Expand Down