Simplify building and testing the Go components

4 files changed, 3 insertions, 65 deletions

diff --git a/support/gitlab_config.rb b/support/gitlab_config.rb
index 1416488..52ac5ee 100644
--- a/support/gitlab_config.rb
+++ b/support/gitlab_config.rb
@@ -1,5 +1,8 @@
 require 'yaml'
 
+# Determine the root of the gitlab-shell directory
+ROOT_PATH = ENV.fetch('GITLAB_SHELL_DIR', File.expand_path('..', __dir__))
+
 class GitlabConfig
   attr_reader :config
 
diff --git a/support/go-format b/support/go-format
deleted file mode 100755
index 59af23c..0000000
--- a/support/go-format
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-
-def main(check)
-  go_files = Dir['go/**/*.go']
-  cmd = %w[gofmt -s -l]
-  cmd << '-w' unless check
-  cmd += go_files
-  output = IO.popen(cmd, 'r', &:read)
-  $stdout.write(output)
-  abort 'gofmt failed' unless $?.success?
-  if check && output.lines.any? { |l| l != "\n" }
-    abort "\nPlease run #{$0} to fix formatting"
-  end
-end
-
-main(ARGV.first == 'check')
diff --git a/support/go-test b/support/go-test
deleted file mode 100755
index 0c043f6..0000000
--- a/support/go-test
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-
-require_relative 'go_build'
-include GoBuild
-
-def main
-  ensure_build_dir_exists
-  run!(GO_ENV, %w[go test ./...], chdir: GO_DIR)
-  puts 'OK'
-end
-
-main
diff --git a/support/go_build.rb b/support/go_build.rb
deleted file mode 100644
index 6f4c92b..0000000
--- a/support/go_build.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# Helper functions to build go code in gitlab-shell
-
-require 'fileutils'
-
-# Determine the root of the gitlab-shell directory
-ROOT_PATH = ENV.fetch('GITLAB_SHELL_DIR', File.expand_path('..', __dir__))
-
-module GoBuild
-  GO_DIR = File.join(ROOT_PATH, 'go')
-  BUILD_DIR = File.join(ROOT_PATH, 'go_build')
-
-  GO_ENV = {
-    # $GOBIN controls where 'go install' puts binaries. Prior to go mod,
-    # this was $GOPATH/bin.
-    'GOBIN' => File.join(BUILD_DIR, 'bin'),
-    # Force the use of go mod, even if $GOPATH is set.
-    'GO111MODULE' => 'on',
-    # Downloading dependencies via proxy.golang.org is faster and more
-    # reliable than downloading from canonical sources. We need this
-    # environment variable because as of Go 1.12, the default is still to
-    # download from canonical sources.
-    'GOPROXY' => 'https://proxy.golang.org'
-  }.freeze
-
-  def ensure_build_dir_exists
-    FileUtils.mkdir_p(BUILD_DIR)
-  end
-
-  def run!(env, cmd, options = {})
-    raise "env must be a hash" unless env.is_a?(Hash)
-    raise "cmd must be an array" unless cmd.is_a?(Array)
-
-    unless system(env, *cmd, options)
-      abort "command failed: #{env.inspect} #{cmd.join(' ')}"
-    end
-  end
-end