From aeec981468f05e38e966672c5304d93ef1b8739e Mon Sep 17 00:00:00 2001 From: Ethan Dickson Date: Thu, 24 Apr 2025 02:47:33 +0000 Subject: [PATCH 1/2] ci: move go install tools to seperate action --- .github/actions/setup-go-tools/action.yaml | 14 ++++++++++++++ .github/workflows/ci.yaml | 14 ++------------ 2 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 .github/actions/setup-go-tools/action.yaml diff --git a/.github/actions/setup-go-tools/action.yaml b/.github/actions/setup-go-tools/action.yaml new file mode 100644 index 0000000000000..4afda2a1782ae --- /dev/null +++ b/.github/actions/setup-go-tools/action.yaml @@ -0,0 +1,14 @@ +name: "Setup Go tools" +description: | + Set up tools for `make gen` and `offlinedocs` +runs: + using: "composite" + steps: + - name: go install tools + shell: bash + run: | + go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.30 + go install storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.34 + go install golang.org/x/tools/cmd/goimports@v0.31.0 + go install github.com/mikefarah/yq/v4@v4.44.3 + go install go.uber.org/mock/mockgen@v0.5.0 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 54239330f2a4f..6a0d3b621cf0f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -249,12 +249,7 @@ jobs: uses: ./.github/actions/setup-tf - name: go install tools - run: | - go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.30 - go install storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.34 - go install golang.org/x/tools/cmd/goimports@v0.31.0 - go install github.com/mikefarah/yq/v4@v4.44.3 - go install go.uber.org/mock/mockgen@v0.5.0 + uses: ./.github/actions/setup-go-tools - name: Install Protoc run: | @@ -860,12 +855,7 @@ jobs: uses: ./.github/actions/setup-go - name: Install go tools - run: | - go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.30 - go install storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.34 - go install golang.org/x/tools/cmd/goimports@v0.31.0 - go install github.com/mikefarah/yq/v4@v4.44.3 - go install go.uber.org/mock/mockgen@v0.5.0 + uses: ./.github/actions/setup-go-tools - name: Setup sqlc uses: ./.github/actions/setup-sqlc From e4c5225d3feb34bed600f91d575866407a166122 Mon Sep 17 00:00:00 2001 From: Ethan Dickson Date: Thu, 24 Apr 2025 02:52:27 +0000 Subject: [PATCH 2/2] comment --- .github/actions/setup-go-tools/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-go-tools/action.yaml b/.github/actions/setup-go-tools/action.yaml index 4afda2a1782ae..9c08a7d417b13 100644 --- a/.github/actions/setup-go-tools/action.yaml +++ b/.github/actions/setup-go-tools/action.yaml @@ -1,6 +1,6 @@ name: "Setup Go tools" description: | - Set up tools for `make gen` and `offlinedocs` + Set up tools for `make gen`, `offlinedocs` and Schmoder CI. runs: using: "composite" steps: