diff options
| author | mo khan <mo.khan@gmail.com> | 2020-09-09 15:34:17 +0000 |
|---|---|---|
| committer | mo khan <mo.khan@gmail.com> | 2020-09-09 15:34:17 +0000 |
| commit | 442402496d0107fa69de61e966215e06f95506e8 (patch) | |
| tree | a889c46e68ac7ccc1dbcc956f595a11f2ca58996 /config | |
| parent | 7c48761abcd59ca79c01f730653c1485ccbdebdd (diff) | |
| parent | b9f3bd95b1b7dd4b7a62c02af569a97471a1e45d (diff) | |
Merge branch 'eread/fix-references-to-go-version' into 'master'v3.25.2
Change references to Go to version 1.15.1
See merge request gitlab-org/security-products/license-management!216
Diffstat (limited to 'config')
| -rw-r--r-- | config/projects/golang.rb | 2 | ||||
| -rw-r--r-- | config/software/asdf_golang.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/projects/golang.rb b/config/projects/golang.rb index d40d6aa..0a53092 100644 --- a/config/projects/golang.rb +++ b/config/projects/golang.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -golang_version = ENV.fetch('GOLANG_VERSION', '1.14.6') +golang_version = ENV.fetch('GOLANG_VERSION', '1.15.1') name "golang-#{golang_version}" maintainer "GitLab B.V." diff --git a/config/software/asdf_golang.rb b/config/software/asdf_golang.rb index f412649..80d5cdd 100644 --- a/config/software/asdf_golang.rb +++ b/config/software/asdf_golang.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true name "asdf_golang" -default_version "1.14.6" +default_version "1.15.1" source url: "https://golang.org/dl/go#{version}.linux-amd64.tar.gz" relative_path "go" |