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

Added tags pull step to drone config to show correct version hashes i… #6836

Merged
merged 4 commits into from
May 2, 2019

Conversation

kolaente
Copy link
Member

@kolaente kolaente commented May 2, 2019

As title.

@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label May 2, 2019
@techknowlogick techknowlogick added this to the 1.9.0 milestone May 2, 2019
.drone.yml Outdated Show resolved Hide resolved
@kolaente
Copy link
Member Author

kolaente commented May 2, 2019

Tags are pulled correctly, so proper versions should work now. Though I'm not quite sure how to test this since it needs a release...

@zeripath
Copy link
Contributor

zeripath commented May 2, 2019

Damn I don't think it works (from the first build log):

GO111MODULE=on go build -mod=vendor -i -v -tags 'bindata sqlite sqlite_unlock_notify' -ldflags '-s -w -X "main.MakeVersion=GNU Make 4.1" -X "main.Version=a96318d30" -X "main.Tags=bindata sqlite sqlite_unlock_notify"' -o gitea

@techknowlogick techknowlogick added the status/blocked This PR cannot be merged yet, i.e. because it depends on another unmerged PR label May 2, 2019
@kolaente
Copy link
Member Author

kolaente commented May 2, 2019

From the build command, it appers to work now: https://drone.gitea.io/go-gitea/gitea/8634/1/10

GO111MODULE=on go build -mod=vendor -i -v -tags 'bindata sqlite sqlite_unlock_notify' -ldflags '-s -w -X "main.MakeVersion=GNU Make 4.1" -X "main.Version=1.9.0+dev-192-g6fbf87d2d" -X "main.Tags=bindata sqlite sqlite_unlock_notify"' -o gitea 

@techknowlogick techknowlogick removed the status/blocked This PR cannot be merged yet, i.e. because it depends on another unmerged PR label May 2, 2019
@GiteaBot GiteaBot 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 May 2, 2019
@codecov-io
Copy link

codecov-io commented May 2, 2019

Codecov Report

❗ No coverage uploaded for pull request base (master@26c7c97). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #6836   +/-   ##
=========================================
  Coverage          ?   41.21%           
=========================================
  Files             ?      421           
  Lines             ?    58120           
  Branches          ?        0           
=========================================
  Hits              ?    23955           
  Misses            ?    30993           
  Partials          ?     3172

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 26c7c97...6fbf87d. Read the comment docs.

@zeripath zeripath merged commit a27d5d2 into go-gitea:master May 2, 2019
@zeripath
Copy link
Contributor

zeripath commented May 2, 2019

Please send backport to 1.8

@sapk
Copy link
Member

sapk commented May 2, 2019

Does this fix #6806 ?

@zeripath
Copy link
Contributor

zeripath commented May 2, 2019

Well it depends on what they mean by a stable output

@zeripath
Copy link
Contributor

zeripath commented May 2, 2019

But yes things should now have 1.9.0+dev prefixed and similarly for 1.8

@sapk
Copy link
Member

sapk commented May 2, 2019

It should also fix #4782 as on the tag the version is good (no commit) even without the DRONE_TAG set :

/go/src/code.gitea.io/gitea # git checkout v1.8.0
HEAD is now at 799f5e05c 1.8.0 Changelog (#6678)
/go/src/code.gitea.io/gitea # git describe --tags --always | sed 's/-/+/' | sed 's/^v//'
1.8.0

@kolaente kolaente deleted the fix/drone-builds-tags branch May 3, 2019 08:48
kolaente added a commit to kolaente/gitea that referenced this pull request May 3, 2019
@kolaente
Copy link
Member Author

kolaente commented May 3, 2019

Backport is up: #6840

@lafriks lafriks added backport/done All backports for this PR have been created topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile labels May 3, 2019
@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.

None yet

7 participants