From a9d574c98e59467ba83f879bf332105c06cd2fac Mon Sep 17 00:00:00 2001 From: MaxMustermann2 <82761650+MaxMustermann2@users.noreply.github.com> Date: Wed, 28 Jun 2023 07:46:53 +0000 Subject: [PATCH] scripts: restore install_build_tools.sh With #4427, the protofiles are generated using a Docker image and thus `protoc` related binaries are not required. However, `mockgen` and `golangci-lint` are still being used by our Travis build. This change restores the file that installs them, and removes `protoc` related files from the list of installations. --- scripts/install_build_tools.sh | 13 +++++++++++++ tools/tools.go | 1 - 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100755 scripts/install_build_tools.sh diff --git a/scripts/install_build_tools.sh b/scripts/install_build_tools.sh new file mode 100755 index 0000000000..a5537a5406 --- /dev/null +++ b/scripts/install_build_tools.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +set -eu + +unset -v progdir +case "${0}" in +/*) progdir="/";; +*/*) progdir="${0%/*}";; +*) progdir="."; +esac + +sed -n 's/^ _ "\([^"]*\)"$/\1/p' "${progdir}/../tools/tools.go" | \ + xargs "${progdir}/goget.sh" \ No newline at end of file diff --git a/tools/tools.go b/tools/tools.go index dd98334afc..e926f15a25 100644 --- a/tools/tools.go +++ b/tools/tools.go @@ -11,6 +11,5 @@ package tools // scripts/install_build_tools.sh parses these imports to install them. import ( _ "github.com/golang/mock/mockgen" - _ "github.com/golang/protobuf/protoc-gen-go" _ "github.com/golangci/golangci-lint/cmd/golangci-lint" )