Skip to content

Commit a62c0a2

Browse files
authored
refactor: remove gimme and run_with_go_ver script (elastic#13415)
Now that we have a toolchain directive explicitly defined in go.mod we can drop gimme and the shell script to ensure we are running the correct go version
1 parent d57fedf commit a62c0a2

File tree

5 files changed

+3
-989
lines changed

5 files changed

+3
-989
lines changed

Tiltfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,10 @@ if config.tilt_subcommand == "down":
9898
print(local("kubectl delete --ignore-not-found namespace/elastic-system"))
9999

100100
# Add a button for sending trace events and metrics to APM Server.
101-
run_with_go_ver = os.path.join(script_dir, 'run_with_go_ver')
102101
load('ext://uibutton', 'cmd_button')
103102
cmd_button(
104103
'apm-server:sendotlp',
105-
argv=['sh', '-c', 'cd systemtest && %s go run ./cmd/sendotlp' % run_with_go_ver],
104+
argv=['sh', '-c', 'cd systemtest && go run ./cmd/sendotlp'],
106105
resource='apm-server',
107106
icon_name='input',
108107
text='Send OTLP data',

go.mk

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ GITCOMMITTIMESTAMPUNIX ?= $(shell git log -1 --pretty=%ct)
55
GITREFFILE ?= $(GITDIR)/$(shell git rev-parse --symbolic-full-name HEAD)
66
GITROOT ?= $(shell git rev-parse --show-toplevel)
77

8-
# Ensure the Go version in .go-version is installed and used.
9-
GOROOT?=$(shell $(GITROOT)/script/run_with_go_ver go env GOROOT)
8+
GOROOT?=$(go env GOROOT)
109
GOLANG_VERSION=$(shell cat $(GITROOT)/.go-version)
11-
GO:=$(GOROOT)/bin/go
10+
GO:=go
1211
GOARCH:=$(shell $(GO) env GOARCH)
1312
export PATH:=$(GOROOT)/bin:$(PATH)
1413

script/gimme/LICENSE

-21
This file was deleted.

0 commit comments

Comments
 (0)