Skip to content
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

#24752 Fix timestamped versions #24845

Merged
merged 2 commits into from Apr 5, 2018
Merged

#24752 Fix timestamped versions #24845

merged 2 commits into from Apr 5, 2018

Conversation

2m
Copy link
Member

@2m 2m commented Apr 4, 2018

Ideally we should use sbt-dynver, but currently version tagged commits are not part of the direct history of master. Upon release we fork master and add a commit which only has version change. Then we tag that commit with a release tag. Therefore sbt-dynver can not currently derive version from history.

Fixes #24752

@akka-ci akka-ci added the validating PR is currently being validated by Jenkins label Apr 4, 2018
@@ -20,13 +20,15 @@ object AkkaBuild {

lazy val buildSettings = Dependencies.Versions ++ Seq(
organization := "com.typesafe.akka",
version := "2.5-SNAPSHOT")
version := (version in ThisBuild).value)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you document this a bit more? It seems rather magical where the actual value comes from now

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ping @2m comment and merge? :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay. But with sbt inspect is the king. It shows where values for settings come from more robustly than comments.

Copy link
Member

@ktoso ktoso Apr 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

document intent why we do this so weirdly, and hint at inspect?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a comment

@akka-ci akka-ci added tested PR that was successfully built and tested by Jenkins and removed validating PR is currently being validated by Jenkins labels Apr 4, 2018
@akka-ci
Copy link

akka-ci commented Apr 4, 2018

Test PASSed.

@ktoso ktoso requested a review from johanandren April 5, 2018 09:28
Copy link
Member

@johanandren johanandren left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@akka-ci akka-ci added validating PR is currently being validated by Jenkins and removed tested PR that was successfully built and tested by Jenkins labels Apr 5, 2018
@@ -20,13 +20,16 @@ object AkkaBuild {

lazy val buildSettings = Dependencies.Versions ++ Seq(
organization := "com.typesafe.akka",
version := "2.5-SNAPSHOT")
// use the same value as in the build scope, so it can be overriden by stampVersion
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this helps, thanks! 👍

Copy link
Member

@ktoso ktoso left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, LGTM

@ktoso ktoso merged commit 8f40eb1 into akka:master Apr 5, 2018
@2m 2m deleted the wip-fix-stampede-2m branch April 5, 2018 12:01
@akka-ci akka-ci added tested PR that was successfully built and tested by Jenkins and removed validating PR is currently being validated by Jenkins labels Apr 5, 2018
@akka-ci
Copy link

akka-ci commented Apr 5, 2018

Test PASSed.

Copy link
Member

@patriknw patriknw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
tested PR that was successfully built and tested by Jenkins
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants