-
-
Notifications
You must be signed in to change notification settings - Fork 5.7k
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
Update hard-coded version to 1.3.0+dev #2390
Conversation
Sorry this is for 1.3.0+dev (force-pushed). |
How about 1.3.0-dev since it's target is 1.3.0 but isn't reach. |
I'm still confused about + vs -
Before the change we used +
What's the difference, semantically ?
Will 1.3.0-dev be older than 1.3.0 ?
Will 1.3.0+dev be newer than 1.3.0 ?
|
integrations/version_test.go
Outdated
@@ -17,7 +17,7 @@ import ( | |||
func TestVersion(t *testing.T) { | |||
prepareTestEnv(t) | |||
|
|||
setting.AppVer = "1.1.0+dev" | |||
setting.AppVer = "1.3.0+dev" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You forgot to update this like the main.go in the last commit
I realized that the test doens't need to match the hard-coded version.
I'm actually tempted to use "test" in there instead, to avoid the
confusion (and I guess that test could test at least two versions...)
|
It seems when we build via |
That's because the Makefile rule generates version via `git describe`,
which does not read the hard-coded version number in source code.
If you want a better description there, you can add a 1.3 tag
pointing to the first commit which got into master branch, ie:
git tag 1.3 a915a09
|
So what's the meaning of the hard-code? |
It's for when you `go get` or `go build`, or build from sources
(outside of a git repository).
This PR does not change policy, just fixes its current application
|
LGTM |
@lunny so is this good to merge now ? |
Shouldn't be version set only when you add tag? Now it should be Edit: Changed |
For master, I suggest always use |
LGTM |
Codecov Report
@@ Coverage Diff @@
## master #2390 +/- ##
=======================================
Coverage 27.38% 27.38%
=======================================
Files 86 86
Lines 17010 17010
=======================================
Hits 4658 4658
Misses 11673 11673
Partials 679 679 Continue to review full report at Codecov.
|
Was previously set to 1.1.0+dev