diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 05e416d..6e6cca6 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -38,6 +38,7 @@ jobs: echo "GOPATH=$HOME/go" >> "$GITHUB_ENV" echo "$HOME/go/bin" >> "$GITHUB_PATH" echo "$HOME/sdk/gotip/bin" >> "$GITHUB_PATH" + make gotip/fix - name: Build example application run: go build example/main.go - name: Run tests diff --git a/.github/workflows/gotip_cron_test.yml b/.github/workflows/gotip_cron_test.yml index 55e8915..5454f43 100644 --- a/.github/workflows/gotip_cron_test.yml +++ b/.github/workflows/gotip_cron_test.yml @@ -24,6 +24,7 @@ jobs: echo "GOPATH=$HOME/go" >> "$GITHUB_ENV" echo "$HOME/go/bin" >> "$GITHUB_PATH" echo "$HOME/sdk/gotip/bin" >> "$GITHUB_PATH" + make gotip/fix - name: Build example application run: go build example/main.go - name: Run tests diff --git a/Makefile b/Makefile index 5b7a6ed..276989f 100644 --- a/Makefile +++ b/Makefile @@ -16,3 +16,10 @@ go/mod: cd godeltaprof/ && GO111MODULE=on go mod tidy cd x/k6/ && GO111MODULE=on go mod download cd x/k6/ && GO111MODULE=on go mod tidy + +# https://github.com/grafana/pyroscope-go/issues/129 +.PHONY: gotip/fix +gotip/fix: + cd godeltaprof/compat/ && gotip get -d -v golang.org/x/tools@v0.25.0 + git --no-pager diff + ! git diff | grep toolchain