From a2039e93488124e56fd69de0068dc1c5dd71f4db Mon Sep 17 00:00:00 2001 From: Carles Garcia Date: Wed, 18 Dec 2024 17:01:49 +0100 Subject: [PATCH] Update tools image in the Makefile (#4468) * Update tools image in the Makefile * Skip docker-ci-tools workflow in forks --- .github/workflows/docker-ci-tools.yml | 3 +++ build/tools.mk | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-ci-tools.yml b/.github/workflows/docker-ci-tools.yml index 6a8ab08466f..8ed7bec6ee8 100644 --- a/.github/workflows/docker-ci-tools.yml +++ b/.github/workflows/docker-ci-tools.yml @@ -17,6 +17,7 @@ permissions: jobs: get-image-tag: + if: github.repository == 'grafana/tempo' # skip in forks runs-on: ubuntu-24.04 outputs: tag: ${{ steps.get-tag.outputs.tag }} @@ -29,6 +30,7 @@ jobs: echo "tag=$(./tools/image-tag)" >> "$GITHUB_OUTPUT" docker-ci-tools: + if: github.repository == 'grafana/tempo' needs: get-image-tag strategy: matrix: @@ -50,6 +52,7 @@ jobs: docker push $IMAGE_NAME:$TAG_ARCH manifest: + if: github.repository == 'grafana/tempo' needs: ['get-image-tag', 'docker-ci-tools'] runs-on: ubuntu-latest env: diff --git a/build/tools.mk b/build/tools.mk index 675cb12f3fe..a6bb8a22d35 100644 --- a/build/tools.mk +++ b/build/tools.mk @@ -12,7 +12,7 @@ TOOL_DIR ?= tools TOOL_CONFIG ?= $(TOOL_DIR)/tools.go TOOLS_IMAGE ?= grafana/tempo-ci-tools -TOOLS_IMAGE_TAG ?= main-e87b8d4 +TOOLS_IMAGE_TAG ?= main-d02611a GOTOOLS ?= $(shell cd $(TOOL_DIR) && go list -e -f '{{ .Imports }}' -tags tools |tr -d '[]')