Skip to content

Fix cross-compile builds #6609

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Apr 14, 2019
Merged

Fix cross-compile builds #6609

merged 2 commits into from
Apr 14, 2019

Conversation

techknowlogick
Copy link
Member

Fix #6600

@techknowlogick techknowlogick added type/bug topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile backport/v1.8 labels Apr 14, 2019
@techknowlogick techknowlogick added this to the 1.9.0 milestone Apr 14, 2019
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Apr 14, 2019
@codecov-io
Copy link

codecov-io commented Apr 14, 2019 •
edited
Loading

Codecov Report

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

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #6609   +/-   ##
=========================================
  Coverage          ?   40.47%           
=========================================
  Files             ?      405           
  Lines             ?    54388           
  Branches          ?        0           
=========================================
  Hits              ?    22012           
  Misses            ?    29349           
  Partials          ?     3027

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 3297b8d...410a5b0. Read the comment docs.

lunny
lunny reviewed Apr 14, 2019
View reviewed changes
Makefile
@@ -332,7 +334,7 @@ release-windows:
fi
xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out gitea-$(VERSION) .
ifeq ($(CI),drone)
mv /build/* $(DIST)/binaries
cp /build/* $(DIST)/binaries
Copy link
Member

Choose a reason for hiding this comment

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

Should we cp -r?

Copy link
Member

Choose a reason for hiding this comment

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

Why recursive?

@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 Apr 14, 2019
@techknowlogick techknowlogick merged commit 38889f0 into go-gitea:master Apr 14, 2019
@techknowlogick techknowlogick deleted the fix-cross-compile branch April 14, 2019 15:06
@techknowlogick techknowlogick mentioned this pull request Apr 14, 2019
Merged
@techknowlogick techknowlogick added the backport/done All backports for this PR have been created label Apr 14, 2019
lafriks pushed a commit that referenced this pull request Apr 14, 2019
@techknowlogick @lafriks
Fix cross-compile builds (#6609) (#6615)
e8ca2da 
* Fix cross-compile builds (#6609)

* Update Makefile

* remove bash requirement
@lunny lunny mentioned this pull request Apr 16, 2019
Closed
7 tasks
@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.
Reviewers

@lunny lunny lunny left review comments

@lafriks lafriks lafriks approved these changes

+1 more reviewer

@sapk sapk sapk approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
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 type/bug
Projects
None yet
Milestone
1.9.0
Development

Successfully merging this pull request may close these issues.

1.7.6 release does not contain builds
6 participants
@techknowlogick @codecov-io @lunny @lafriks @sapk @GiteaBot