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.

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

[suggest] change merge strategy： do not check write access if user in merge white list #10951

Merged
merged 18 commits into from
Apr 8, 2020
Merged

[suggest] change merge strategy： do not check write access if user in merge white list #10951

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
fe6d2e3
[suggest] change merge strategy： do not check write access if user in…
everhopingandwaiting Apr 4, 2020
4aa47e7
Merge branch 'master' into patch-2-merge-strategy-temp
everhopingandwaiting Apr 4, 2020
cfd30af
Merge branch 'master' into patch-2-merge-strategy-temp
everhopingandwaiting Apr 4, 2020
7755e10
fix NPE
everhopingandwaiting Apr 4, 2020
dff428f
Merge branch 'master' into patch-2-merge-strategy-temp
everhopingandwaiting Apr 5, 2020
cbbb402
Merge branch 'master' into patch-2-merge-strategy-temp
zeripath Apr 5, 2020
f1edeb9
Fix cross compile (#10952)
lunny Apr 5, 2020
dc1a473
fix merge box icon color bug (#10974)
a1012112796 Apr 5, 2020
7f49034
[skip ci] Updated translations via Crowdin
GiteaBot Apr 5, 2020
87c4bc1
Allow X in addition to x in tasks (#10979)
zeripath Apr 5, 2020
6e94a61
remove api: merge reqRepoWriter
everhopingandwaiting Apr 6, 2020
d931ea2
Merge branch 'master' into patch-2-merge-strategy-temp
everhopingandwaiting Apr 6, 2020
fe38a93
Merge branch 'master' into patch-2-merge-strategy-temp
techknowlogick Apr 7, 2020
fa27e5b
Merge branch 'master' into patch-2-merge-strategy-temp
everhopingandwaiting Apr 7, 2020
fc0e25d
Merge branch 'master' into patch-2-merge-strategy-temp
everhopingandwaiting Apr 7, 2020
0352a86
Merge branch 'master' into patch-2-merge-strategy-temp
techknowlogick Apr 7, 2020
ff1fb2e
Merge branch 'master' into patch-2-merge-strategy-temp
zeripath Apr 7, 2020
cf9bade
Merge branch 'master' into patch-2-merge-strategy-temp
guillep2k Apr 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
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]>
  • Loading branch information
@lunny @zeripath @everhopingandwaiting
2 people authored and everhopingandwaiting committed Apr 6, 2020
commit f1edeb92642f126104c6b10060727dc76063aad3
15 changes: 15 additions & 0 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,21 @@ steps:
- go build -mod=vendor -o gitea_no_gcc # test if build succeeds without the sqlite tag
depends_on: [lint-backend]

- name: build-backend-arm64
pull: always
image: golang:1.14
environment:
GO111MODULE: on
GOPROXY: off
GOOS: linux
GOARCH: arm64
TAGS: bindata
commands:
- curl -sL https://deb.nodesource.com/setup_12.x | bash - && apt -y install nodejs
- make build # test cross compile
- rm ./gitea # clean
depends_on: [lint-backend]

- name: build-backend-386
pull: always
image: golang:1.14
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ backend: go-check generate $(EXECUTABLE)

.PHONY: generate
generate: $(TAGS_PREREQ)
$(GO) generate -mod=vendor -tags '$(TAGS)' $(GO_PACKAGES)
CC= GOOS= GOARCH= $(GO) generate -mod=vendor -tags '$(TAGS)' $(GO_PACKAGES)

$(EXECUTABLE): $(GO_SOURCES) $(TAGS_PREREQ)
$(GO) build -mod=vendor $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@
Expand Down