summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authormo khan <mo.khan@gmail.com>2020-09-10 19:31:53 +0000
committermo khan <mo.khan@gmail.com>2020-09-10 19:31:53 +0000
commitaa44fb0d5ca05da6780869fb187985a4600cb969 (patch)
tree850ca482ea48dca003c7c4d582376ec5618d5520 /config
parentd4da2eff19bd210d18b0dbb80aa305c6a955a644 (diff)
parentf4edc9a8e9c0a94056ecb80ec6333dfa42857a14 (diff)
Merge branch 'fix-go-patch-install-dir' into 'master'v3.25.4
Use golang_version as install directory for Go See merge request gitlab-org/security-products/license-management!217
Diffstat (limited to 'config')
-rw-r--r--config/projects/golang.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/config/projects/golang.rb b/config/projects/golang.rb
index 0a53092..cb21ae8 100644
--- a/config/projects/golang.rb
+++ b/config/projects/golang.rb
@@ -6,8 +6,7 @@ name "golang-#{golang_version}"
maintainer "GitLab B.V."
homepage "https://golang.org/"
-major, minor, _patch = golang_version.split('.')
-install_dir "/opt/asdf/installs/golang/#{major}.#{minor}/go"
+install_dir "/opt/asdf/installs/golang/#{golang_version}/go"
package_scripts_path Pathname.pwd.join("config/scripts/golang")
build_version golang_version