Commit 06ab148d authored by Nick Thomas's avatar Nick Thomas

Merge branch 'pks-workhorse-go-1.16' into 'master'

Bump minimum required Go version for Workhorse to 1.15

See merge request gitlab-org/gitlab!59347
parents cf587293 8ac994f9
workhorse:verify: workhorse:verify:
extends: .workhorse:rules:workhorse extends: .workhorse:rules:workhorse
image: ${GITLAB_DEPENDENCY_PROXY}golang:1.15 image: ${GITLAB_DEPENDENCY_PROXY}golang:1.16
stage: test stage: test
needs: [] needs: []
script: script:
...@@ -23,14 +23,10 @@ workhorse:verify: ...@@ -23,14 +23,10 @@ workhorse:verify:
- apt-get update && apt-get -y install libimage-exiftool-perl - apt-get update && apt-get -y install libimage-exiftool-perl
- make -C workhorse test - make -C workhorse test
workhorse:test using go 1.13:
extends: .workhorse:test
image: ${GITLAB_DEPENDENCY_PROXY}golang:1.13
workhorse:test using go 1.14:
extends: .workhorse:test
image: ${GITLAB_DEPENDENCY_PROXY}golang:1.14
workhorse:test using go 1.15: workhorse:test using go 1.15:
extends: .workhorse:test extends: .workhorse:test
image: ${GITLAB_DEPENDENCY_PROXY}golang:1.15 image: ${GITLAB_DEPENDENCY_PROXY}golang:1.15
workhorse:test using go 1.16:
extends: .workhorse:test
image: ${GITLAB_DEPENDENCY_PROXY}golang:1.16
---
title: Bump minimum required Go version for workhorse to 1.15
merge_request: 59347
author:
type: other
...@@ -10,7 +10,7 @@ workflow: ...@@ -10,7 +10,7 @@ workflow:
- if: '$CI_COMMIT_BRANCH =~ /^[\d-]+-stable$/' - if: '$CI_COMMIT_BRANCH =~ /^[\d-]+-stable$/'
default: default:
image: golang:1.13 image: golang:1.16
tags: tags:
- gitlab-org - gitlab-org
...@@ -41,18 +41,14 @@ changelog: ...@@ -41,18 +41,14 @@ changelog:
- apt-get update && apt-get -y install libimage-exiftool-perl - apt-get update && apt-get -y install libimage-exiftool-perl
- make test - make test
test using go 1.13:
extends: .test
image: golang:1.13
test using go 1.14:
extends: .test
image: golang:1.14
test using go 1.15: test using go 1.15:
extends: .test extends: .test
image: golang:1.15 image: golang:1.15
test using go 1.16:
extends: .test
image: golang:1.16
test:release: test:release:
rules: rules:
- if: '$CI_COMMIT_TAG' - if: '$CI_COMMIT_TAG'
......
# Installation # Installation
To install GitLab Workhorse you need [Go 1.13 or To install GitLab Workhorse you need [Go 1.15 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/).
......
module gitlab.com/gitlab-org/gitlab-workhorse module gitlab.com/gitlab-org/gitlab-workhorse
go 1.13 go 1.15
require ( require (
github.com/Azure/azure-storage-blob-go v0.11.1-0.20201209121048-6df5d9af221d github.com/Azure/azure-storage-blob-go v0.11.1-0.20201209121048-6df5d9af221d
...@@ -33,13 +33,12 @@ require ( ...@@ -33,13 +33,12 @@ require (
gocloud.dev v0.21.1-0.20201223184910-5094f54ed8bb gocloud.dev v0.21.1-0.20201223184910-5094f54ed8bb
golang.org/x/lint v0.0.0-20200302205851-738671d3881b golang.org/x/lint v0.0.0-20200302205851-738671d3881b
golang.org/x/net v0.0.0-20201224014010-6772e930b67b golang.org/x/net v0.0.0-20201224014010-6772e930b67b
golang.org/x/sys v0.0.0-20210110051926-789bb1bd4061 // indirect
golang.org/x/text v0.3.5 // indirect golang.org/x/text v0.3.5 // indirect
golang.org/x/tools v0.0.0-20201203202102-a1a1cbeaa516 golang.org/x/tools v0.1.0
google.golang.org/genproto v0.0.0-20210111234610-22ae2b108f89 // indirect google.golang.org/genproto v0.0.0-20210111234610-22ae2b108f89 // indirect
google.golang.org/grpc v1.34.1 google.golang.org/grpc v1.34.1
google.golang.org/grpc/examples v0.0.0-20201226181154-53788aa5dcb4 // indirect google.golang.org/grpc/examples v0.0.0-20201226181154-53788aa5dcb4 // indirect
honnef.co/go/tools v0.0.1-2020.1.5 honnef.co/go/tools v0.1.3
) )
// go get tries to enforce semantic version compatibility via module paths. // go get tries to enforce semantic version compatibility via module paths.
......
This diff is collapsed.
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