Skip to content

Commit

Permalink
Further harden and document whitesource
Browse files Browse the repository at this point in the history
  • Loading branch information
raboof committed Dec 7, 2017
1 parent fd2302d commit be84a3e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ deploy:
provider: script
script:
- sbt -J-XX:ReservedCodeCacheSize=256m +publish
- sbt 'set credentials += Credentials("whitesource", "whitesourcesoftware.com", "", System.getenv("WHITESOURCE_KEY"))' whitesourceUpdate
# - sbt -J-XX:ReservedCodeCacheSize=256m +publish akka-http/bintraySyncMavenCentral # enable if we want to sync to central automatically
on:
tags: true
Expand Down
1 change: 1 addition & 0 deletions RELEASING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
## Releasing
1. If this is a new minor (not patch) release, rename the 'akka-http-x.x-stable' reporting project in [WhiteSource](http://saas.whitesourcesoftware.com/) accordingly
1. Communicate that a release is about to be released in [Gitter Akka Dev Channel](https://gitter.im/akka/dev), so that no new Pull Requests are merged
1. Add a release notes entry in docs/src/main/paradox/scala/http/release-notes.md. As a helper run
`scripts/commits-for-release-notes.sh <last-version-tag>` which will output a list of commits grouped by submodule, and the closed issues for this milestone.
Expand Down
12 changes: 6 additions & 6 deletions project/Whitesource.scala
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@ object Whitesource extends AutoPlugin {

override def trigger = allRequirements

def majorMinor(version: String): Option[String] = """\d+\.\d+""".r.findFirstIn(version)

override lazy val projectSettings = Seq(
// do not change the value of whitesourceProduct
whitesourceProduct := "Lightbend Reactive Platform",
whitesourceFailOnError := true,
whitesourceAggregateProjectName := {
val projectName = (moduleName in LocalRootProject).value.replace("-root", "")
projectName + "-" + (
if (isSnapshot.value)
if (gitCurrentBranch.value == "master") "master"
else "adhoc"
else majorMinor((version in LocalRootProject).value).map(_ + "-stable").getOrElse("adhoc")
)
}
else CrossVersion.partialVersion((version in LocalRootProject).value)
.map { case (major,minor) => s"$major.$minor-stable" }
.getOrElse("adhoc"))
},
whitesourceForceCheckAllDependencies := true,
whitesourceFailOnError := true,
)
}

0 comments on commit be84a3e

Please sign in to comment.