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

Update hard-coded version to 1.3.0+dev #2390

Merged
merged 4 commits into from
Oct 12, 2017
Merged

Conversation

strk
Copy link
Member

@strk strk commented Aug 25, 2017

Was previously set to 1.1.0+dev

@strk strk changed the title Update hard-coded version to 1.2.0+dev Update hard-coded version to 1.3.0+dev Aug 25, 2017
@strk
Copy link
Member Author

strk commented Aug 25, 2017

Sorry this is for 1.3.0+dev (force-pushed).
Will follow PR for 1.2 branch too

@tboerger tboerger added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Aug 25, 2017
@lunny
Copy link
Member

lunny commented Aug 25, 2017

How about 1.3.0-dev since it's target is 1.3.0 but isn't reach.

@strk
Copy link
Member Author

strk commented Aug 25, 2017 via email

@@ -17,7 +17,7 @@ import (
func TestVersion(t *testing.T) {
prepareTestEnv(t)

setting.AppVer = "1.1.0+dev"
setting.AppVer = "1.3.0+dev"
Copy link
Member

@sapk sapk Aug 25, 2017

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

@strk
Copy link
Member Author

strk commented Aug 25, 2017 via email

@lunny lunny added this to the 1.3.0 milestone Aug 30, 2017
@lunny lunny added the type/docs This PR mainly updates/creates documentation label Aug 30, 2017
@lunny
Copy link
Member

lunny commented Sep 3, 2017

It seems when we build via TAGS="bindata" make generate build, the version is still Gitea version 1.1.0+534-g0307707ca built with: bindata.

@strk
Copy link
Member Author

strk commented Sep 3, 2017 via email

@lunny
Copy link
Member

lunny commented Sep 4, 2017

So what's the meaning of the hard-code?

@strk
Copy link
Member Author

strk commented Sep 4, 2017 via email

@ethantkoenig
Copy link
Member

LGTM

@tboerger tboerger added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Sep 9, 2017
@strk
Copy link
Member Author

strk commented Sep 26, 2017

@lunny so is this good to merge now ?

@Morlinest
Copy link
Member

Morlinest commented Oct 10, 2017

Shouldn't be version set only when you add tag? Now it should be v1.2.0+dev (or v1.2.x+dev) till next minor/major release.

Edit: Changed - to + as - means pre-release.

@lunny
Copy link
Member

lunny commented Oct 12, 2017

For master, I suggest always use - but +. It should be v1.3.0-dev means next release is v1.3.0

@daviian
Copy link
Member

daviian commented Oct 12, 2017

LGTM

@tboerger tboerger added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Oct 12, 2017
@codecov-io
Copy link

Codecov Report

Merging #2390 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           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.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update dff26e2...b0178f2. Read the comment docs.

@lafriks lafriks merged commit a4cd461 into go-gitea:master Oct 12, 2017
lafriks pushed a commit that referenced this pull request Feb 3, 2018
Now that 1.4.0 is out the new target is 1.5.0

(See #2390 and #2988 for more context if needed)
@go-gitea go-gitea locked and limited conversation to collaborators Nov 23, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/docs This PR mainly updates/creates documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants