From 2fbc6f7d2b849529c8a169f690bcc9dcf8c2c0ed Mon Sep 17 00:00:00 2001 From: ArchitectBot <61872893+architectbot@users.noreply.github.com> Date: Tue, 10 Oct 2023 14:24:50 +0200 Subject: [PATCH] Align files (#17) * Align files * Extend ignore vulnerability --------- Co-authored-by: github-actions Co-authored-by: Moritz Gottschling --- .github/workflows/zz_generated.add-team-labels.yaml | 2 +- .../workflows/zz_generated.add-to-project-board.yaml | 4 ++-- .../workflows/zz_generated.check_values_schema.yaml | 4 ++-- .github/workflows/zz_generated.create_release.yaml | 12 ++++++------ .../workflows/zz_generated.create_release_pr.yaml | 6 +++--- .github/workflows/zz_generated.gitleaks.yaml | 4 ++-- .nancy-ignore | 2 +- Makefile | 2 +- Makefile.gen.app.mk | 2 +- Makefile.gen.go.mk | 2 +- renovate.json | 3 +-- 11 files changed, 21 insertions(+), 22 deletions(-) diff --git a/.github/workflows/zz_generated.add-team-labels.yaml b/.github/workflows/zz_generated.add-team-labels.yaml index 2d258807..4a2db906 100644 --- a/.github/workflows/zz_generated.add-team-labels.yaml +++ b/.github/workflows/zz_generated.add-team-labels.yaml @@ -45,7 +45,7 @@ jobs: done echo "EOF" >> $GITHUB_ENV - name: Apply label to issue - if: ${{ env.LABEL != '' }} + if: ${{ env.LABEL != '' && env.LABEL != 'null' && env.LABEL != null }} uses: actions-ecosystem/action-add-labels@v1 with: github_token: ${{ secrets.ISSUE_AUTOMATION }} diff --git a/.github/workflows/zz_generated.add-to-project-board.yaml b/.github/workflows/zz_generated.add-to-project-board.yaml index a8569831..ae6b3986 100644 --- a/.github/workflows/zz_generated.add-to-project-board.yaml +++ b/.github/workflows/zz_generated.add-to-project-board.yaml @@ -56,7 +56,7 @@ jobs: echo "BOARD=${BOARD}" >> $GITHUB_ENV - name: Add issue to personal board - if: ${{ env.BOARD != 'null' && env.BOARD != '' }} + if: ${{ env.BOARD != 'null' && env.BOARD != '' && env.BOARD != null }} uses: actions/add-to-project@main with: project-url: ${{ env.BOARD }} @@ -82,7 +82,7 @@ jobs: echo "BOARD=${BOARD}" >> $GITHUB_ENV - name: Add issue to team board - if: ${{ env.BOARD != 'null' && env.BOARD != '' }} + if: ${{ env.BOARD != 'null' && env.BOARD != '' && env.BOARD != null }} uses: actions/add-to-project@main with: project-url: ${{ env.BOARD }} diff --git a/.github/workflows/zz_generated.check_values_schema.yaml b/.github/workflows/zz_generated.check_values_schema.yaml index c450aeea..1d01974b 100644 --- a/.github/workflows/zz_generated.check_values_schema.yaml +++ b/.github/workflows/zz_generated.check_values_schema.yaml @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.9.0 +# devctl@6.13.0 # name: 'Values and schema' on: @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/zz_generated.create_release.yaml b/.github/workflows/zz_generated.create_release.yaml index 57c5dd5c..a8d1c3c9 100644 --- a/.github/workflows/zz_generated.create_release.yaml +++ b/.github/workflows/zz_generated.create_release.yaml @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.9.0 +# devctl@6.13.0 # name: Create Release on: @@ -53,7 +53,7 @@ jobs: echo "version=${version}" >> $GITHUB_OUTPUT - name: Checkout code if: ${{ steps.get_version.outputs.version != '' }} - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Get project.go path id: get_project_go_path if: ${{ steps.get_version.outputs.version != '' }} @@ -103,7 +103,7 @@ jobs: tarball_binary_path: "*/src/${binary}" smoke_test: "${binary} --version" - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Update project.go id: update_project_go env: @@ -143,7 +143,7 @@ jobs: version: "${{ needs.gather_facts.outputs.version }}" title: "Bump version to ${{ steps.update_project_go.outputs.new_version }}" run: | - hub pull-request -f -m "${{ env.title }}" -b ${{ env.base }} -h ${{ env.branch }} -r ${{ github.actor }} + gh pr create --title "${{ env.title }}" --body "" --base ${{ env.base }} --head ${{ env.branch }} --reviewer ${{ github.actor }} create_release: name: Create release runs-on: ubuntu-22.04 @@ -154,7 +154,7 @@ jobs: upload_url: ${{ steps.create_gh_release.outputs.upload_url }} steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.sha }} - name: Ensure correct version in project.go @@ -208,7 +208,7 @@ jobs: tarball_binary_path: "*/src/${binary}" smoke_test: "${binary} --version" - name: Check out the repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 # Clone the whole history, not just the most recent commit. - name: Fetch all tags and branches diff --git a/.github/workflows/zz_generated.create_release_pr.yaml b/.github/workflows/zz_generated.create_release_pr.yaml index 6f07166e..3fdb0f68 100644 --- a/.github/workflows/zz_generated.create_release_pr.yaml +++ b/.github/workflows/zz_generated.create_release_pr.yaml @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.9.0 +# devctl@6.13.0 # name: Create Release PR on: @@ -152,7 +152,7 @@ jobs: binary: "architect" version: "6.11.0" - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ needs.gather_facts.outputs.branch }} - name: Prepare release changes @@ -227,4 +227,4 @@ jobs: base: "${{ needs.gather_facts.outputs.base }}" version: "${{ needs.gather_facts.outputs.version }}" run: | - hub pull-request -f -m "Release v${{ env.version }}" -a ${{ github.actor }} -b ${{ env.base }} -h ${{ needs.gather_facts.outputs.branch }} + gh pr create --assignee ${{ github.actor }} --title "Release v${{ env.version }}" --body "" --base ${{ env.base }} --head "${{ needs.gather_facts.outputs.branch }}" diff --git a/.github/workflows/zz_generated.gitleaks.yaml b/.github/workflows/zz_generated.gitleaks.yaml index 2c70a482..82f177b1 100644 --- a/.github/workflows/zz_generated.gitleaks.yaml +++ b/.github/workflows/zz_generated.gitleaks.yaml @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.9.0 +# devctl@6.13.0 # name: gitleaks @@ -10,7 +10,7 @@ jobs: gitleaks: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: '0' - name: gitleaks-action diff --git a/.nancy-ignore b/.nancy-ignore index e650c2e5..9bf4f52d 100644 --- a/.nancy-ignore +++ b/.nancy-ignore @@ -1,2 +1,2 @@ #pkg:golang/k8s.io/apiserver@v0.25.0 -CVE-2020-8561 until=2023-10-01 +CVE-2020-8561 until=2024-01-08 # k8s.io/apiserver@v0.25.0 diff --git a/Makefile b/Makefile index 6b6025aa..4097c844 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.9.0 +# devctl@6.13.0 # include Makefile.*.mk diff --git a/Makefile.gen.app.mk b/Makefile.gen.app.mk index 0929f908..07d3c53f 100644 --- a/Makefile.gen.app.mk +++ b/Makefile.gen.app.mk @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.9.0 +# devctl@6.13.0 # ##@ App diff --git a/Makefile.gen.go.mk b/Makefile.gen.go.mk index bcb0dd23..c37cf44c 100644 --- a/Makefile.gen.go.mk +++ b/Makefile.gen.go.mk @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.9.0 +# devctl@6.13.0 # APPLICATION := $(shell go list -m | cut -d '/' -f 3) diff --git a/renovate.json b/renovate.json index 247af9d5..d881115e 100644 --- a/renovate.json +++ b/renovate.json @@ -55,6 +55,5 @@ "datasourceTemplate": "github-releases", "extractVersionTemplate": "^v(?.*)$" } - ], - "schedule": [ "after 6am on thursday" ] + ] }