Skip to content

[CI] Merge self-upgrade-main into main #433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 6, 2025
Merged

[CI] Merge self-upgrade-main into main #433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions klone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,70 +10,70 @@ targets:
- folder_name: boilerplate
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: c3d364ac4221b114f9b31e755ed328c541246330
repo_hash: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
repo_path: modules/boilerplate
- folder_name: cert-manager
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: c3d364ac4221b114f9b31e755ed328c541246330
repo_hash: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
repo_path: modules/cert-manager
- folder_name: controller-gen
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: c3d364ac4221b114f9b31e755ed328c541246330
repo_hash: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
repo_path: modules/controller-gen
- folder_name: generate-verify
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: c3d364ac4221b114f9b31e755ed328c541246330
repo_hash: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
repo_path: modules/generate-verify
- folder_name: go
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: c3d364ac4221b114f9b31e755ed328c541246330
repo_hash: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
repo_path: modules/go
- folder_name: helm
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: c3d364ac4221b114f9b31e755ed328c541246330
repo_hash: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
repo_path: modules/helm
- folder_name: help
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: c3d364ac4221b114f9b31e755ed328c541246330
repo_hash: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
repo_path: modules/help
- folder_name: kind
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: c3d364ac4221b114f9b31e755ed328c541246330
repo_hash: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
repo_path: modules/kind
- folder_name: klone
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: c3d364ac4221b114f9b31e755ed328c541246330
repo_hash: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
repo_path: modules/klone
- folder_name: licenses
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: c3d364ac4221b114f9b31e755ed328c541246330
repo_hash: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
repo_path: modules/licenses
- folder_name: oci-build
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: c3d364ac4221b114f9b31e755ed328c541246330
repo_hash: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
repo_path: modules/oci-build
- folder_name: oci-publish
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: c3d364ac4221b114f9b31e755ed328c541246330
repo_hash: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
repo_path: modules/oci-publish
- folder_name: repository-base
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: c3d364ac4221b114f9b31e755ed328c541246330
repo_hash: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
repo_path: modules/repository-base
- folder_name: tools
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: c3d364ac4221b114f9b31e755ed328c541246330
repo_hash: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
repo_path: modules/tools
7 changes: 6 additions & 1 deletion make/_shared/go/01_mod.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,16 @@ default_govulncheck_generate_base_dir := $(dir $(lastword $(MAKEFILE_LIST)))/bas
# pipeline (eg. a GitLab pipeline).
govulncheck_generate_base_dir ?= $(default_govulncheck_generate_base_dir)

# The org name used in the govulncheck GH action. This is used to prevent the govulncheck job
# being run on every fork of the repo.
govulncheck_generate_org ?= cert-manager

.PHONY: generate-govulncheck
## Generate base files in the repository
## @category [shared] Generate/ Verify
generate-govulncheck:
cp -r $(govulncheck_generate_base_dir)/. ./
@mkdir -p ./.github/workflows
sed 's/ORGNAMEHERE/$(govulncheck_generate_org)/g' $(govulncheck_generate_base_dir)/.github/workflows/govulncheck.yaml > .github/workflows/govulncheck.yaml

shared_generate_targets += generate-govulncheck

Expand Down
2 changes: 1 addition & 1 deletion make/_shared/go/base/.github/workflows/govulncheck.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
govulncheck:
runs-on: ubuntu-latest

if: github.repository_owner == 'cert-manager'
if: github.repository_owner == 'ORGNAMEHERE'

steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
Expand Down