💚 fix git 1.7.1 job

parent 905a8747
Pipeline #15958012 passed with stages
in 26 minutes and 42 seconds
......@@ -163,12 +163,14 @@ git 1.7.1:
GOROOT: /usr/local/go
GOPATH: /go
CGO_ENABLED: 0
script:
OUR_PACKAGES: gitlab.com/gitlab-org/gitlab-runner/executors/shell gitlab.com/gitlab-org/gitlab-runner/shells
before_script:
- yum install -y -q git && git version
- curl https://storage.googleapis.com/golang/go1.8.5.linux-amd64.tar.gz | tar zx -C $(dirname "$GOROOT")
- export PATH=${GOROOT}/bin:$PATH
- source ci/touch_make_dependencies
- go test -v gitlab.com/gitlab-org/gitlab-runner/executors/shell gitlab.com/gitlab-org/gitlab-runner/shells
script:
- make test
#
# Build stage
......
......@@ -44,7 +44,7 @@ export PATH := $(GOPATH_BIN):$(PATH)
# Packages in vendor/ are included in ./...
# https://github.com/golang/go/issues/11659
OUR_PACKAGES=$(subst _$(BUILD_DIR),$(PKG),$(shell go list ./... | grep -v '/vendor/'))
OUR_PACKAGES ?= $(subst _$(BUILD_DIR),$(PKG),$(shell go list ./... | grep -v '/vendor/'))
GO_LDFLAGS ?= -X $(COMMON_PACKAGE_NAMESPACE).NAME=$(PACKAGE_NAME) -X $(COMMON_PACKAGE_NAMESPACE).VERSION=$(VERSION) \
-X $(COMMON_PACKAGE_NAMESPACE).REVISION=$(REVISION) -X $(COMMON_PACKAGE_NAMESPACE).BUILT=$(BUILT) \
......
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