Skip to content

Commit

Permalink
Use vendors when go generate (go-gitea#7340)
Browse files Browse the repository at this point in the history
* use vendors when go generate

* update docs about golang minimal requirement from 1.9 to 1.11

* fix build
  • Loading branch information
lunny authored and jeffliu27 committed Jul 18, 2019
1 parent 7667119 commit eb095a9
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
6 changes: 4 additions & 2 deletions .drone.yml
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
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
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
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

0 comments on commit eb095a9

Please sign in to comment.