diff options
author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-04-20 09:26:39 +0300 |
---|---|---|
committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-04-20 09:26:39 +0300 |
commit | 61404ee4997721100430c6acf4586ec3d85b15da (patch) | |
tree | 484ed0efeaadda8953877f232da07bfb731e7021 | |
parent | 0f93ceb8a8ccfe38ee3fde399efcb49aa91cbedd (diff) | |
parent | f913cd27a3984d6371f9fe01321d52e85ea1aff4 (diff) |
Merge branch 'pks-go-1.16' into 'master'
Upgrade minimum required Go version to 1.15
Closes #3498
See merge request gitlab-org/gitaly!3352
-rw-r--r-- | .gitlab-ci.yml | 12 | ||||
-rw-r--r-- | .tool-version | 3 | ||||
-rw-r--r-- | README.md | 5 | ||||
-rw-r--r-- | changelogs/unreleased/pks-go-1-16.yml | 5 | ||||
-rw-r--r-- | go.mod | 2 |
5 files changed, 17 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a69c2f1c7..bf1a25bf8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ variables: SAST_DISABLE_DIND: "true" SAST_DEFAULT_ANALYZERS: "gosec" GIT_VERSION: "v2.31.1" - GO_VERSION: "1.15" + GO_VERSION: "1.16" RUBY_VERSION: "2.7" include: @@ -117,7 +117,7 @@ build: - _support/test-boot . parallel: matrix: - - GO_VERSION: [ "1.14", "1.15" ] + - GO_VERSION: [ "1.15", "1.16" ] GIT_VERSION: [ "v2.31.1" ] binaries: @@ -138,7 +138,7 @@ binaries: expire_in: 6 months parallel: matrix: - - GO_VERSION: [ "1.14", "1.15" ] + - GO_VERSION: [ "1.15", "1.16" ] GIT_VERSION: "v2.31.1" test: @@ -159,10 +159,10 @@ test: junit: _build/reports/go-tests-report-go-${GO_VERSION}-git-${GIT_VERSION}.xml parallel: matrix: - - GO_VERSION: [ "1.14", "1.15" ] + - GO_VERSION: [ "1.15", "1.16" ] GIT_VERSION: [ "v2.31.1" ] TARGET: test - - GO_VERSION: "1.15" + - GO_VERSION: "1.16" GIT_VERSION: "v2.31.1" TARGET: [ test-with-proxies, test-with-praefect, race-go ] @@ -174,7 +174,7 @@ nightly:git: - make all ${TARGET} parallel: matrix: - - GO_VERSION: "1.15" + - GO_VERSION: "1.16" GIT_VERSION: ["master", "next"] TARGET: [ test, test-with-proxies, test-with-praefect ] rules: diff --git a/.tool-version b/.tool-version new file mode 100644 index 000000000..56d98ca03 --- /dev/null +++ b/.tool-version @@ -0,0 +1,3 @@ +# Versions of Gitaly dependencies managed by asdf. +golang 1.15.11 1.16.3 +ruby 2.7.2 @@ -54,9 +54,8 @@ GitLab.com, read about our [observability story](doc/observability.md)! Most users won't install Gitaly on its own. It is already included in [your GitLab installation](https://about.gitlab.com/install/). -Gitaly requires Go 1.13.9 or newer and Ruby 2.7. Run `make` to download -and compile Ruby dependencies, and to compile the Gitaly Go -executable. +Gitaly requires Go 1.15 or Go 1.16 and Ruby 2.7. Run `make` to download and +compile Ruby dependencies, and to compile the Gitaly Go executable. Gitaly uses `git`. Versions `2.31.0` and newer are supported. diff --git a/changelogs/unreleased/pks-go-1-16.yml b/changelogs/unreleased/pks-go-1-16.yml new file mode 100644 index 000000000..ffbd01911 --- /dev/null +++ b/changelogs/unreleased/pks-go-1-16.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade minimum required Go version to 1.15 +merge_request: 3352 +author: +type: deprecated @@ -50,4 +50,4 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect ) -go 1.14 +go 1.15 |