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 cross compile #10952

Merged
merged 6 commits into from
Apr 5, 2020
Merged

Fix cross compile #10952

merged 6 commits into from
Apr 5, 2020

Conversation

lunny
Copy link
Member

@lunny lunny commented Apr 4, 2020

Fix #10949, #10950

Now we can use TAGS=bindata GOOS=linux GOARCH=arm64 make build to cross compile.

@lunny lunny added the topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile label Apr 4, 2020
@6543
Copy link
Member

6543 commented Apr 4, 2020

plz resolve conflict :)

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 4, 2020
@GiteaBot GiteaBot 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 Apr 5, 2020
@codecov-io
Copy link

codecov-io commented Apr 5, 2020

Codecov Report

Merging #10952 into master will increase coverage by 0.03%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #10952      +/-   ##
==========================================
+ Coverage   43.60%   43.63%   +0.03%     
==========================================
  Files         597      597              
  Lines       83923    83923              
==========================================
+ Hits        36593    36619      +26     
+ Misses      42816    42794      -22     
+ Partials     4514     4510       -4     
Impacted Files Coverage Δ
modules/indexer/stats/db.go 50.00% <0.00%> (ø)
models/gpg_key.go 53.95% <0.00%> (+0.52%) ⬆️
modules/git/repo.go 48.11% <0.00%> (+0.83%) ⬆️
modules/queue/workerpool.go 58.00% <0.00%> (+1.06%) ⬆️
services/pull/pull.go 35.88% <0.00%> (+1.17%) ⬆️
services/pull/check.go 52.43% <0.00%> (+2.43%) ⬆️
services/pull/temp_repo.go 31.62% <0.00%> (+2.56%) ⬆️
services/pull/patch.go 65.73% <0.00%> (+2.79%) ⬆️
modules/git/utils.go 70.14% <0.00%> (+4.47%) ⬆️

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 baadb51...055d9df. Read the comment docs.

@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 5, 2020
@6543
Copy link
Member

6543 commented Apr 5, 2020

Ping

@lunny lunny merged commit 686850e into go-gitea:master Apr 5, 2020
@lunny lunny deleted the lunny/cross_compile branch April 5, 2020 12:28
everhopingandwaiting pushed a commit to everhopingandwaiting/gitea that referenced this pull request Apr 6, 2020
* Fix cross compile

* Add test for cross compile

* Fix drone

* Fix drone

* Also prevent CC environment not to generate

Co-authored-by: zeripath <[email protected]>
@lunny lunny mentioned this pull request Apr 6, 2020
lafriks pushed a commit that referenced this pull request Apr 8, 2020
… merge white list (#10951)

* [suggest] change merge strategy: do not check write access if user in merge white list #10935

(cherry picked from commit ba74fc6389dfcad03c273441a49b54e4d38c86ee)

* fix NPE

* Fix cross compile (#10952)

* Fix cross compile

* Add test for cross compile

* Fix drone

* Fix drone

* Also prevent CC environment not to generate

Co-authored-by: zeripath <[email protected]>

* fix merge box icon color bug (#10974)

that because need some space beturn ``text`` and color defines

Signed-off-by: a1012112796 <[email protected]>

* [skip ci] Updated translations via Crowdin

* Allow X in addition to x in tasks (#10979)

Signed-off-by: Andrew Thornton <[email protected]>

* remove api: merge  reqRepoWriter

Co-authored-by: zeripath <[email protected]>
Co-authored-by: Lunny Xiao <[email protected]>
Co-authored-by: 赵智超 <[email protected]>
Co-authored-by: GiteaBot <[email protected]>
Co-authored-by: techknowlogick <[email protected]>
Co-authored-by: guillep2k <[email protected]>
ydelafollye pushed a commit to ydelafollye/gitea that referenced this pull request Jul 31, 2020
… merge white list (go-gitea#10951)

* [suggest] change merge strategy: do not check write access if user in merge white list go-gitea#10935

(cherry picked from commit ba74fc6389dfcad03c273441a49b54e4d38c86ee)

* fix NPE

* Fix cross compile (go-gitea#10952)

* Fix cross compile

* Add test for cross compile

* Fix drone

* Fix drone

* Also prevent CC environment not to generate

Co-authored-by: zeripath <[email protected]>

* fix merge box icon color bug (go-gitea#10974)

that because need some space beturn ``text`` and color defines

Signed-off-by: a1012112796 <[email protected]>

* [skip ci] Updated translations via Crowdin

* Allow X in addition to x in tasks (go-gitea#10979)

Signed-off-by: Andrew Thornton <[email protected]>

* remove api: merge  reqRepoWriter

Co-authored-by: zeripath <[email protected]>
Co-authored-by: Lunny Xiao <[email protected]>
Co-authored-by: 赵智超 <[email protected]>
Co-authored-by: GiteaBot <[email protected]>
Co-authored-by: techknowlogick <[email protected]>
Co-authored-by: guillep2k <[email protected]>
@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
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.

Unable to cross compile from amd64 to arm7 with bundled assets
5 participants