Commit 55aea650 authored by Nick Thomas's avatar Nick Thomas

Merge branch 'go-1.8' into 'master'

Drop support for Go <1.8

See merge request !176
parents 92194a55 1ee0979a
...@@ -4,18 +4,6 @@ ...@@ -4,18 +4,6 @@
- go version - go version
- make test - make test
test using go 1.5:
<<: *test_definition
image: golang:1.5
test using go 1.6:
<<: *test_definition
image: golang:1.6
test using go 1.7:
<<: *test_definition
image: golang:1.7
test using go 1.8: test using go 1.8:
<<: *test_definition <<: *test_definition
image: golang:1.8 image: golang:1.8
......
...@@ -3,7 +3,6 @@ VERSION=$(shell git describe)-$(shell date -u +%Y%m%d.%H%M%S) ...@@ -3,7 +3,6 @@ VERSION=$(shell git describe)-$(shell date -u +%Y%m%d.%H%M%S)
BUILD_DIR = $(shell pwd) BUILD_DIR = $(shell pwd)
export GOPATH=${BUILD_DIR}/_build export GOPATH=${BUILD_DIR}/_build
export PATH:=${GOPATH}/bin:${PATH} export PATH:=${GOPATH}/bin:${PATH}
export GO15VENDOREXPERIMENT=1
GOBUILD=go build -ldflags "-X main.Version=${VERSION}" GOBUILD=go build -ldflags "-X main.Version=${VERSION}"
PKG=gitlab.com/gitlab-org/gitlab-workhorse PKG=gitlab.com/gitlab-org/gitlab-workhorse
PKG_ALL = $(shell GOPATH=${GOPATH} go list ${PKG}/... | grep -v /vendor/) PKG_ALL = $(shell GOPATH=${GOPATH} go list ${PKG}/... | grep -v /vendor/)
......
...@@ -143,7 +143,7 @@ gitlab-workhorse -authBackend http://localhost:8080/gitlab ...@@ -143,7 +143,7 @@ gitlab-workhorse -authBackend http://localhost:8080/gitlab
## Installation ## Installation
To install gitlab-workhorse you need [Go 1.5 or To install gitlab-workhorse you need [Go 1.8 or
newer](https://golang.org/dl) and [GNU newer](https://golang.org/dl) and [GNU
Make](https://www.gnu.org/software/make/). Make](https://www.gnu.org/software/make/).
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment