From d4c958bb126acf1be6634233b87272af1de91b14 Mon Sep 17 00:00:00 2001 From: Tim Ramlot <42113979+inteon@users.noreply.github.com> Date: Fri, 20 Dec 2024 21:18:01 +0000 Subject: [PATCH] Run 'make upgrade-klone' and 'make generate' Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com> --- .github/workflows/govulncheck.yaml | 4 ++++ klone.yaml | 18 +++++++++--------- .../go/base/.github/workflows/govulncheck.yaml | 4 ++++ 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.github/workflows/govulncheck.yaml b/.github/workflows/govulncheck.yaml index 9dc1cb9..716cdfd 100644 --- a/.github/workflows/govulncheck.yaml +++ b/.github/workflows/govulncheck.yaml @@ -19,6 +19,10 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + # Adding `fetch-depth: 0` makes sure tags are also fetched. We need + # the tags so `git describe` returns a valid version. + # see https://github.com/actions/checkout/issues/701 for extra info about this option + with: { fetch-depth: 0 } - id: go-version run: | diff --git a/klone.yaml b/klone.yaml index 4670916..d585def 100644 --- a/klone.yaml +++ b/klone.yaml @@ -10,45 +10,45 @@ targets: - folder_name: boilerplate repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2 + repo_hash: fb47cf6181d34186cb7c7ddc083afc8516d44501 repo_path: modules/boilerplate - folder_name: cert-manager repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2 + repo_hash: fb47cf6181d34186cb7c7ddc083afc8516d44501 repo_path: modules/cert-manager - folder_name: executable repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2 + repo_hash: fb47cf6181d34186cb7c7ddc083afc8516d44501 repo_path: modules/executable - folder_name: generate-verify repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2 + repo_hash: fb47cf6181d34186cb7c7ddc083afc8516d44501 repo_path: modules/generate-verify - folder_name: go repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2 + repo_hash: fb47cf6181d34186cb7c7ddc083afc8516d44501 repo_path: modules/go - folder_name: help repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2 + repo_hash: fb47cf6181d34186cb7c7ddc083afc8516d44501 repo_path: modules/help - folder_name: klone repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2 + repo_hash: fb47cf6181d34186cb7c7ddc083afc8516d44501 repo_path: modules/klone - folder_name: repository-base repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2 + repo_hash: fb47cf6181d34186cb7c7ddc083afc8516d44501 repo_path: modules/repository-base - folder_name: tools repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2 + repo_hash: fb47cf6181d34186cb7c7ddc083afc8516d44501 repo_path: modules/tools diff --git a/make/_shared/go/base/.github/workflows/govulncheck.yaml b/make/_shared/go/base/.github/workflows/govulncheck.yaml index 9dc1cb9..716cdfd 100644 --- a/make/_shared/go/base/.github/workflows/govulncheck.yaml +++ b/make/_shared/go/base/.github/workflows/govulncheck.yaml @@ -19,6 +19,10 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + # Adding `fetch-depth: 0` makes sure tags are also fetched. We need + # the tags so `git describe` returns a valid version. + # see https://github.com/actions/checkout/issues/701 for extra info about this option + with: { fetch-depth: 0 } - id: go-version run: |