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

Fix drone git@next plugin Gitea version display when building tag #4380

Merged
merged 4 commits into from
Jul 12, 2018

Conversation

lafriks
Copy link
Member

@lafriks lafriks commented Jul 5, 2018

Currently Drone CI when using git@next plugin to build tagged version gitea shows sha1 instead of actual version in footer.

Fixes #4359

See comments in issue for more details

@lafriks lafriks added topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile backport/v1.5 labels Jul 5, 2018
@lafriks lafriks added this to the 1.5.0 milestone Jul 5, 2018
Makefile Outdated
else
VERSION ?= master
endif
GITEA_VERSION := $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')
Copy link
Member

Choose a reason for hiding this comment

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

Fix indention

Copy link
Member Author

Choose a reason for hiding this comment

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

done

@bkcsoft bkcsoft added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 5, 2018
@codecov-io
Copy link

codecov-io commented Jul 5, 2018

Codecov Report

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

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #4380   +/-   ##
=======================================
  Coverage   20.06%   20.06%           
=======================================
  Files         153      153           
  Lines       30769    30769           
=======================================
  Hits         6174     6174           
  Misses      23652    23652           
  Partials      943      943

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 8afd500...0289cbf. Read the comment docs.

@bkcsoft bkcsoft 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 Jul 5, 2018
@lafriks lafriks modified the milestones: 1.5.0, 1.6.0 Jul 5, 2018
@lunny
Copy link
Member

lunny commented Jul 6, 2018

conflict

@lafriks
Copy link
Member Author

lafriks commented Jul 10, 2018

@lunny conflict resolved

@lafriks
Copy link
Member Author

lafriks commented Jul 10, 2018

Drone failure is not related to PR

@bkcsoft bkcsoft 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 Jul 10, 2018
@lafriks lafriks merged commit a7f9090 into go-gitea:master Jul 12, 2018
@lafriks lafriks deleted the fix/drone_tag_version branch July 12, 2018 03:32
lafriks added a commit to lafriks-fork/gitea that referenced this pull request Jul 12, 2018
@lafriks lafriks added the backport/done All backports for this PR have been created label Jul 12, 2018
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1.5.0-rc1 does not use 1.5.0-rc1 as version
7 participants