From 1197ca95e38fe0ac28ed532a0f87a0666503fd4f Mon Sep 17 00:00:00 2001 From: Javan lacerda Date: Tue, 8 Oct 2024 18:58:20 +0000 Subject: [PATCH] fix full tag Signed-off-by: Javan lacerda --- .github/workflows/container-build.yml | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/container-build.yml b/.github/workflows/container-build.yml index 88d9d87a8..9e0aa83fd 100644 --- a/.github/workflows/container-build.yml +++ b/.github/workflows/container-build.yml @@ -77,4 +77,4 @@ jobs: - name: container run: | echo "Formated Label: ${{ steps.labels.outputs.FORMATED_LABELS }}" - KO_PREFIX=gcr.io/projectsigstore/fulcio/ci/fulcio FORMATED_LABEL=${{ steps.labels.outputs.FORMATED_LABELS }} RUN_NUMBER=${{ github.run_number }} make sign-keyless-ci + KO_PREFIX=gcr.io/projectsigstore/fulcio/ci/fulcio FORMATED_LABEL=${{ steps.labels.outputs.FORMATED_LABELS }} make sign-keyless-ci diff --git a/Makefile b/Makefile index 4ebd67950..6c5797dc4 100644 --- a/Makefile +++ b/Makefile @@ -49,9 +49,9 @@ FULCIO_YAML ?= fulcio-$(GIT_TAG).yaml # It should be blank for default builds FORMATED_LABEL ?= -RUN_NUMBER ?= "local" +GITHUB_RUN_NUMBER ?= "local" -FULL_TAG := "0.$(shell date +%Y%m%d).$(RUN_NUMBER)+ref.$(GIT_HASH)" +FULL_TAG := "0.$(shell date +%Y%m%d).$(GITHUB_RUN_NUMBER)-ref.$(GIT_VERSION)" # Binaries PROTOC-GEN-GO := $(TOOLS_BIN_DIR)/protoc-gen-go