Skip to content

Use vendors when go generate #7340

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

Merged
merged 4 commits into from
Jul 7, 2019
Merged

Use vendors when go generate #7340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62b8dac
use vendors when go generate
lunny Jul 2, 2019
d0df2c2
update docs about golang minimal requirement from 1.9 to 1.11
lunny Jul 2, 2019
05f2153
fix build
lunny Jul 7, 2019
a49cfed
Merge branch 'master' into lunny/fix_generate
techknowlogick Jul 7, 2019
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
6 changes: 4 additions & 2 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,11 @@ steps:

- name: build-without-gcc
pull: always
image: golang:1.10 # this step is kept as the lowest version of golang that we support
image: golang:1.11 # this step is kept as the lowest version of golang that we support
environment:
GO111MODULE: on
commands:
- go build -o gitea_no_gcc # test if build succeeds without the sqlite tag
- go build -mod=vendor -o gitea_no_gcc # test if build succeeds without the sqlite tag

- name: build
pull: always
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 @@ -97,7 +97,7 @@ vet:

.PHONY: generate
generate:
GO111MODULE=on $(GO) generate $(PACKAGES)
GO111MODULE=on $(GO) generate -mod=vendor $(PACKAGES)

.PHONY: generate-swagger
generate-swagger:
Expand Down
2 changes: 1 addition & 1 deletion docs/content/doc/advanced/hacking-on-gitea.en-us.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ necessary. To be able to use these you must have the `"$GOPATH"/bin` directory
on the executable path. If you don't add the go bin directory to the
executable path you will have to manage this yourself.

**Note 2**: Go version 1.9 or higher is required; however, it is important
**Note 2**: Go version 1.11 or higher is required; however, it is important
to note that our continuous integration will check that the formatting of the
source code is not changed by `gofmt` using `make fmt-check`. Unfortunately,
the results of `gofmt` can differ by the version of `go`. It is therefore
Expand Down
2 changes: 1 addition & 1 deletion docs/content/doc/installation/from-source.en-us.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ necessary. To be able to use these, you must have the `"$GOPATH/bin"` directory
on the executable path. If you don't add the go bin directory to the
executable path, you will have to manage this yourself.

**Note 2**: Go version 1.9 or higher is required. However, it is recommended to
**Note 2**: Go version 1.11 or higher is required. However, it is recommended to
obtain the same version as our continuous integration, see the advice given in
<a href='{{< relref "doc/advanced/hacking-on-gitea.en-us.md" >}}'>Hacking on
Gitea</a>
Expand Down