diff options
| author | Nick Thomas <nick@gitlab.com> | 2021-09-14 14:42:33 +0100 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2021-09-14 14:42:33 +0100 |
| commit | f827abcee3361e9ce93058c8bf8124a048d59c09 (patch) | |
| tree | 344a5243802a7df0b18e0e4ecb66d7198e213bd2 | |
| parent | 515bfeb98c87e04d36650939aa99e48f28555f85 (diff) | |
| parent | 943b182d2c180d6dc3a967cb50e2966372cd710d (diff) | |
| download | gitlab-shell-f827abcee3361e9ce93058c8bf8124a048d59c09.tar.gz | |
Merge branch 'main' into refactor/cmd
| -rw-r--r-- | .ruby-version | 2 | ||||
| -rw-r--r-- | .tool-versions | 2 | ||||
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | internal/config/config_test.go | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/.ruby-version b/.ruby-version index 37c2961..a4dd9db 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.2 +2.7.4 diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 0000000..7320730 --- /dev/null +++ b/.tool-versions @@ -0,0 +1,2 @@ +ruby 2.7.4 +go 1.16.8 @@ -8,6 +8,8 @@ GOBUILD_FLAGS := -ldflags "-X main.Version=$(VERSION_STRING) -X main.BuildTime=$ PREFIX ?= /usr/local +build: bin/gitlab-shell + validate: verify test verify: verify_golang @@ -40,7 +42,6 @@ setup: _script_install bin/gitlab-shell _script_install: bin/install -build: bin/gitlab-shell compile: bin/gitlab-shell bin/gitlab-shell: $(GO_SOURCES) GOBIN="$(CURDIR)/bin" go install $(GOBUILD_FLAGS) ./cmd/... diff --git a/internal/config/config_test.go b/internal/config/config_test.go index 699a261..78b2ed4 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -32,7 +32,7 @@ func TestHttpClient(t *testing.T) { client, err := config.HttpClient() require.NoError(t, err) - _, err = client.Get("http://host.com/path") + _, err = client.Get(url) require.NoError(t, err) ms, err := prometheus.DefaultGatherer.Gather() |