summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-05-10 15:27:47 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-05-10 15:27:47 +0000
commite85639760cc304f46dc8aaede74693661d06b494 (patch)
tree955a8f1224fc43fefc37df78e0a1993b48ad48a1
parent41fa4ff5ce4c6fdb689d7eb8b425dc8ac9878a95 (diff)
parentb03179b4a6be9a59d7856059284e7d18ed8328f1 (diff)
downloadgitlab-ce-e85639760cc304f46dc8aaede74693661d06b494.tar.gz
Merge branch 'feature/print-go-version-in-env-info' into 'master'
Print Go version in rake gitlab:env:info See merge request !11241
-rw-r--r--changelogs/unreleased/feature-print-go-version-in-env-info.yml4
-rw-r--r--lib/tasks/gitlab/info.rake3
2 files changed, 7 insertions, 0 deletions
diff --git a/changelogs/unreleased/feature-print-go-version-in-env-info.yml b/changelogs/unreleased/feature-print-go-version-in-env-info.yml
new file mode 100644
index 00000000000..34c19b06eda
--- /dev/null
+++ b/changelogs/unreleased/feature-print-go-version-in-env-info.yml
@@ -0,0 +1,4 @@
+---
+title: Print Go version in rake gitlab:env:info
+merge_request: 11241
+author:
diff --git a/lib/tasks/gitlab/info.rake b/lib/tasks/gitlab/info.rake
index a2a2db487b7..e3883278886 100644
--- a/lib/tasks/gitlab/info.rake
+++ b/lib/tasks/gitlab/info.rake
@@ -16,6 +16,8 @@ namespace :gitlab do
redis_version = run_and_match(%w(redis-cli --version), /redis-cli (\d+\.\d+\.\d+)/).to_a
# check Git version
git_version = run_and_match([Gitlab.config.git.bin_path, '--version'], /git version ([\d\.]+)/).to_a
+ # check Go version
+ go_version = run_and_match(%w(go version), /go version (.+)/).to_a
puts ""
puts "System information".color(:yellow)
@@ -30,6 +32,7 @@ namespace :gitlab do
puts "Redis Version:\t#{redis_version[1] || "unknown".color(:red)}"
puts "Git Version:\t#{git_version[1] || "unknown".color(:red)}"
puts "Sidekiq Version:#{Sidekiq::VERSION}"
+ puts "Go Version:\t#{go_version[1] || "unknown".color(:red)}"
# check database adapter
database_adapter = ActiveRecord::Base.connection.adapter_name.downcase