Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: remove gimme and run_with_go_ver script #13415

Merged
merged 2 commits into from
Jun 17, 2024
Merged

refactor: remove gimme and run_with_go_ver script #13415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51e77c7
refactor: remove gimme and run_with_go_ver script
kruskall Jun 13, 2024
87a5ae6
Merge branch 'main' into refactor/remove-gimme
kruskall Jun 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Tiltfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,10 @@ if config.tilt_subcommand == "down":
print(local("kubectl delete --ignore-not-found namespace/elastic-system"))

# Add a button for sending trace events and metrics to APM Server.
run_with_go_ver = os.path.join(script_dir, 'run_with_go_ver')
load('ext://uibutton', 'cmd_button')
cmd_button(
'apm-server:sendotlp',
argv=['sh', '-c', 'cd systemtest && %s go run ./cmd/sendotlp' % run_with_go_ver],
argv=['sh', '-c', 'cd systemtest && go run ./cmd/sendotlp'],
resource='apm-server',
icon_name='input',
text='Send OTLP data',
Expand Down
5 changes: 2 additions & 3 deletions go.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ GITCOMMITTIMESTAMPUNIX ?= $(shell git log -1 --pretty=%ct)
GITREFFILE ?= $(GITDIR)/$(shell git rev-parse --symbolic-full-name HEAD)
GITROOT ?= $(shell git rev-parse --show-toplevel)

# Ensure the Go version in .go-version is installed and used.
GOROOT?=$(shell $(GITROOT)/script/run_with_go_ver go env GOROOT)
GOROOT?=$(go env GOROOT)
GOLANG_VERSION=$(shell cat $(GITROOT)/.go-version)
GO:=$(GOROOT)/bin/go
GO:=go
GOARCH:=$(shell $(GO) env GOARCH)
export PATH:=$(GOROOT)/bin:$(PATH)
axw marked this conversation as resolved.
Show resolved Hide resolved

Expand Down
21 changes: 0 additions & 21 deletions script/gimme/LICENSE
View file
Open in desktop

This file was deleted.

Loading