run 'make upgrade-klone'

Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com>
cert-manager · Jul 17, 2024 · efef41d · efef41d
1 parent ddafbeb
commit efef41d
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 28 deletions.
diff --git a/.github/workflows/govulncheck.yaml b/.github/workflows/govulncheck.yaml
@@ -10,18 +10,21 @@ on:
  schedule:
  - cron: '0 0 * * *'
 
+permissions:
+ contents: read
+
 jobs:
  govulncheck:
  runs-on: ubuntu-latest
 
  steps:
- - uses: actions/checkout@v4
+ - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
  - id: go-version
  run: |
  make print-go-version >> "$GITHUB_OUTPUT"
 
- - uses: actions/setup-go@v5
+ - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
  with:
  go-version: ${{ steps.go-version.outputs.result }}
 

diff --git a/.github/workflows/make-self-upgrade.yaml b/.github/workflows/make-self-upgrade.yaml
@@ -8,6 +8,9 @@ on:
  schedule:
  - cron: '0 0 * * *'
 
+permissions:
+ contents: read
+
 jobs:
  self_upgrade:
  runs-on: ubuntu-latest
@@ -27,13 +30,13 @@ jobs:
  echo "This workflow should not be run on a non-branch-head."
  exit 1
 
- - uses: actions/checkout@v4
+ - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
  - id: go-version
  run: |
  make print-go-version >> "$GITHUB_OUTPUT"
 
- - uses: actions/setup-go@v5
+ - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
  with:
  go-version: ${{ steps.go-version.outputs.result }}
 
@@ -64,7 +67,7 @@ jobs:
  git push -f origin "$SELF_UPGRADE_BRANCH"
 
  - if: ${{ steps.is-up-to-date.outputs.result != 'true' }}
- uses: actions/github-script@v7
+ uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
  with:
  script: |
  const { repo, owner } = context.repo;
@@ -77,7 +80,7 @@ jobs:
  });
  
  if (pulls.data.length < 1) {
- await github.rest.pulls.create({
+ const result = await github.rest.pulls.create({
  title: '[CI] Merge ' + process.env.SELF_UPGRADE_BRANCH + ' into ' + process.env.SOURCE_BRANCH,
  owner: owner,
  repo: repo,
@@ -87,4 +90,10 @@ jobs:
  'This PR is auto-generated to bump the Makefile modules.',
  ].join('\n'),
  });
+ await github.rest.issues.addLabels({
+ owner,
+ repo,
+ issue_number: result.data.number,
+ labels: ['skip-review']
+ });
  }
diff --git a/klone.yaml b/klone.yaml
@@ -14,55 +14,55 @@ targets:
  - folder_name: boilerplate
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: 652f41ca2a789690977902191af89b423482853f
+ repo_hash: 52d325f8aced0b9b6fae6fbe3d2bd2644fddcc93
  repo_path: modules/boilerplate
  - folder_name: cert-manager
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: 652f41ca2a789690977902191af89b423482853f
+ repo_hash: 52d325f8aced0b9b6fae6fbe3d2bd2644fddcc93
  repo_path: modules/cert-manager
  - folder_name: controller-gen
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: 652f41ca2a789690977902191af89b423482853f
+ repo_hash: 52d325f8aced0b9b6fae6fbe3d2bd2644fddcc93
  repo_path: modules/controller-gen
  - folder_name: generate-verify
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: 652f41ca2a789690977902191af89b423482853f
+ repo_hash: 52d325f8aced0b9b6fae6fbe3d2bd2644fddcc93
  repo_path: modules/generate-verify
  - folder_name: go
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: 652f41ca2a789690977902191af89b423482853f
+ repo_hash: 52d325f8aced0b9b6fae6fbe3d2bd2644fddcc93
  repo_path: modules/go
  - folder_name: help
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: 652f41ca2a789690977902191af89b423482853f
+ repo_hash: 52d325f8aced0b9b6fae6fbe3d2bd2644fddcc93
  repo_path: modules/help
  - folder_name: kind
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: 652f41ca2a789690977902191af89b423482853f
+ repo_hash: 52d325f8aced0b9b6fae6fbe3d2bd2644fddcc93
  repo_path: modules/kind
  - folder_name: klone
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: 652f41ca2a789690977902191af89b423482853f
+ repo_hash: 52d325f8aced0b9b6fae6fbe3d2bd2644fddcc93
  repo_path: modules/klone
  - folder_name: oci-build
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: 652f41ca2a789690977902191af89b423482853f
+ repo_hash: 52d325f8aced0b9b6fae6fbe3d2bd2644fddcc93
  repo_path: modules/oci-build
  - folder_name: repository-base
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: 652f41ca2a789690977902191af89b423482853f
+ repo_hash: 52d325f8aced0b9b6fae6fbe3d2bd2644fddcc93
  repo_path: modules/repository-base
  - folder_name: tools
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: 652f41ca2a789690977902191af89b423482853f
+ repo_hash: 52d325f8aced0b9b6fae6fbe3d2bd2644fddcc93
  repo_path: modules/tools
diff --git a/make/_shared/go/base/.github/workflows/govulncheck.yaml b/make/_shared/go/base/.github/workflows/govulncheck.yaml
@@ -10,18 +10,21 @@ on:
  schedule:
  - cron: '0 0 * * *'
 
+permissions:
+ contents: read
+
 jobs:
  govulncheck:
  runs-on: ubuntu-latest
 
  steps:
- - uses: actions/checkout@v4
+ - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
  - id: go-version
  run: |
  make print-go-version >> "$GITHUB_OUTPUT"
 
- - uses: actions/setup-go@v5
+ - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
  with:
  go-version: ${{ steps.go-version.outputs.result }}
 

diff --git a/make/_shared/help/help.sh b/make/_shared/help/help.sh
@@ -71,10 +71,10 @@ done <<< "$raw_expansions"
 
 ## 3. Sort and print the extracted line items
 
-RULE_COLOR="$(tput setaf 6)"
-CATEGORY_COLOR="$(tput setaf 3)"
-CLEAR_STYLE="$(tput sgr0)"
-PURPLE=$(tput setaf 125)
+RULE_COLOR="$(TERM=xterm tput setaf 6)"
+CATEGORY_COLOR="$(TERM=xterm tput setaf 3)"
+CLEAR_STYLE="$(TERM=xterm tput sgr0)"
+PURPLE=$(TERM=xterm tput setaf 125)
 
 extracted_lines=$(echo -e "$extracted_lines" | LC_ALL=C sort -r)
 current_category=""

diff --git a/make/_shared/kind/00_kind_image_versions.mk b/make/_shared/kind/00_kind_image_versions.mk
@@ -1,4 +1,4 @@
-# +skip_license_check 
+# +skip_license_check
 
 # This file is auto-generated by the learn_tools_shas.kind_images.sh script.
 # Do not edit manually.

diff --git a/make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml b/make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml
@@ -8,6 +8,9 @@ on:
  schedule:
  - cron: '0 0 * * *'
 
+permissions:
+ contents: read
+
 jobs:
  self_upgrade:
  runs-on: ubuntu-latest
@@ -27,13 +30,13 @@ jobs:
  echo "This workflow should not be run on a non-branch-head."
  exit 1
 
- - uses: actions/checkout@v4
+ - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
  - id: go-version
  run: |
  make print-go-version >> "$GITHUB_OUTPUT"
 
- - uses: actions/setup-go@v5
+ - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
  with:
  go-version: ${{ steps.go-version.outputs.result }}
 
@@ -64,7 +67,7 @@ jobs:
  git push -f origin "$SELF_UPGRADE_BRANCH"
 
  - if: ${{ steps.is-up-to-date.outputs.result != 'true' }}
- uses: actions/github-script@v7
+ uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
  with:
  script: |
  const { repo, owner } = context.repo;
@@ -77,7 +80,7 @@ jobs:
  });
  
  if (pulls.data.length < 1) {
- await github.rest.pulls.create({
+ const result = await github.rest.pulls.create({
  title: '[CI] Merge ' + process.env.SELF_UPGRADE_BRANCH + ' into ' + process.env.SOURCE_BRANCH,
  owner: owner,
  repo: repo,
@@ -87,4 +90,10 @@ jobs:
  'This PR is auto-generated to bump the Makefile modules.',
  ].join('\n'),
  });
+ await github.rest.issues.addLabels({
+ owner,
+ repo,
+ issue_number: result.data.number,
+ labels: ['skip-review']
+ });
  }