diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2019-07-07 11:00:41 +0800 |
|---|---|---|
| committer | techknowlogick <techknowlogick@gitea.io> | 2019-07-06 23:00:41 -0400 |
| commit | 87404d7c0b0ff42be73398c86f5356959dc7b632 (patch) | |
| tree | a712de060c38c049e4ce418337158ea357fa42cc | |
| parent | f369788347167a47a8fc162e086b92048ff0a43f (diff) | |
| download | gitea-87404d7c0b0ff42be73398c86f5356959dc7b632.tar.gz gitea-87404d7c0b0ff42be73398c86f5356959dc7b632.zip | |
Use vendors when go generate (#7340)
* use vendors when go generate
* update docs about golang minimal requirement from 1.9 to 1.11
* fix build
| -rw-r--r-- | .drone.yml | 6 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | docs/content/doc/advanced/hacking-on-gitea.en-us.md | 2 | ||||
| -rw-r--r-- | docs/content/doc/installation/from-source.en-us.md | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/.drone.yml b/.drone.yml index 9c07599940..086b5cd2b5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -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 @@ -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: diff --git a/docs/content/doc/advanced/hacking-on-gitea.en-us.md b/docs/content/doc/advanced/hacking-on-gitea.en-us.md index d04cdfca5b..ef29051e7e 100644 --- a/docs/content/doc/advanced/hacking-on-gitea.en-us.md +++ b/docs/content/doc/advanced/hacking-on-gitea.en-us.md @@ -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 diff --git a/docs/content/doc/installation/from-source.en-us.md b/docs/content/doc/installation/from-source.en-us.md index ce5915cc3f..cf6d42802e 100644 --- a/docs/content/doc/installation/from-source.en-us.md +++ b/docs/content/doc/installation/from-source.en-us.md @@ -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> |