From 0f43cb0f5d0a385b5ed7cc0e8b1deba680e957b6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 20 Oct 2023 14:12:14 +0000 Subject: [PATCH] Align files --- .circleci/config.yml | 2 +- .../zz_generated.check_values_schema.yaml | 2 +- .../zz_generated.create_release.yaml | 2 +- .../zz_generated.create_release_pr.yaml | 2 +- .github/workflows/zz_generated.gitleaks.yaml | 4 +- .github/zz_generated.windows-code-signing.sh | 2 +- .pre-commit-config.yaml | 2 +- Makefile | 2 +- Makefile.gen.app.mk | 2 +- Makefile.gen.go.mk | 2 +- renovate.json | 59 ------------------- renovate.json5 | 8 +++ 12 files changed, 19 insertions(+), 70 deletions(-) delete mode 100644 renovate.json create mode 100644 renovate.json5 diff --git a/.circleci/config.yml b/.circleci/config.yml index f2c491f0..ca1f53f9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2.1 orbs: - architect: giantswarm/architect@4.31.0 + architect: giantswarm/architect@4.33.0 workflows: build: diff --git a/.github/workflows/zz_generated.check_values_schema.yaml b/.github/workflows/zz_generated.check_values_schema.yaml index 1d01974b..3126cdf5 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.13.0 +# devctl@6.14.0 # name: 'Values and schema' on: diff --git a/.github/workflows/zz_generated.create_release.yaml b/.github/workflows/zz_generated.create_release.yaml index a153ddd9..2fb628cf 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.13.0 +# devctl@6.14.0 # name: Create Release on: diff --git a/.github/workflows/zz_generated.create_release_pr.yaml b/.github/workflows/zz_generated.create_release_pr.yaml index 3fdb0f68..40d9bb1b 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.13.0 +# devctl@6.14.0 # name: Create Release PR on: diff --git a/.github/workflows/zz_generated.gitleaks.yaml b/.github/workflows/zz_generated.gitleaks.yaml index 82f177b1..6efd6284 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.13.0 +# devctl@6.14.0 # name: gitleaks @@ -14,4 +14,4 @@ jobs: with: fetch-depth: '0' - name: gitleaks-action - uses: zricethezav/gitleaks-action@v1.6.0 + uses: giantswarm/gitleaks-action@main diff --git a/.github/zz_generated.windows-code-signing.sh b/.github/zz_generated.windows-code-signing.sh index 7bf0d723..f198328a 100755 --- a/.github/zz_generated.windows-code-signing.sh +++ b/.github/zz_generated.windows-code-signing.sh @@ -2,7 +2,7 @@ # DO NOT EDIT. Generated with: # -# devctl@6.13.0 +# devctl@6.14.0 # APPLICATION=$1 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 81e1c08e..c08e615d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ repos: args: [ --format=json ] - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.5.0 hooks: - id: check-added-large-files # check for unresolved merge conflicts diff --git a/Makefile b/Makefile index 4097c844..0f7f27b8 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.13.0 +# devctl@6.14.0 # include Makefile.*.mk diff --git a/Makefile.gen.app.mk b/Makefile.gen.app.mk index 07d3c53f..3787b357 100644 --- a/Makefile.gen.app.mk +++ b/Makefile.gen.app.mk @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.13.0 +# devctl@6.14.0 # ##@ App diff --git a/Makefile.gen.go.mk b/Makefile.gen.go.mk index a72c223e..6dc18251 100644 --- a/Makefile.gen.go.mk +++ b/Makefile.gen.go.mk @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.13.0 +# devctl@6.14.0 # PACKAGE_DIR := ./bin-dist diff --git a/renovate.json b/renovate.json deleted file mode 100644 index d881115e..00000000 --- a/renovate.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "extends": [ - "config:base" - ], - "labels": ["dependencies", "renovate"], - "packageRules": [ - { - "matchPackagePatterns": [".*giantswarm.*"], - "groupName": "giantswarm modules" - }, - { - "matchPackagePatterns": ["^k8s.io"], - "groupName": "k8s modules", - "allowedVersions": "< 0.21.0" - }, - { - "matchPackagePatterns": ["^sigs.k8s.io"], - "groupName": "sig k8s modules" - }, - { - "excludePackagePatterns": [".*giantswarm.*" ,"^k8s.io", "^sigs.k8s.io"], - "groupName": "misc modules" - }, - { - "matchPackagePatterns": ["^sigs.k8s.io/cluster*"], - "groupName": "capi modules", - "enabled": false - }, - { - "matchPackageNames": ["sigs.k8s.io/controller-runtime"], - "allowedVersions": "< 0.7.0" - }, - { - "matchPackagePatterns": ["^github.com/giantswarm/apiextensions*"], - "allowedVersions": ">= 4.0.0" - } - ], - "postUpdateOptions": ["gomodTidy", "gomodUpdateImportPaths"], - "dependencyDashboard": true, - "ignorePaths": [ - ".github/workflows/zz_generated.*", - ".github/workflows/codeql-analysis.yml", - ".github/workflows/pre_commit_*.yaml" - ], - "ignoreDeps": [ - "actions/setup-go", - "architect", - "github.com/imdario/mergo", - "zricethezav/gitleaks-action" - ], - "regexManagers": [ - { - "fileMatch": ["^helm\\/.+\\/values\\.yaml$"], - "matchStrings": ["repo: (?.*)\n(\\s)*version: (?.*?)\n"], - "datasourceTemplate": "github-releases", - "extractVersionTemplate": "^v(?.*)$" - } - ] -} diff --git a/renovate.json5 b/renovate.json5 new file mode 100644 index 00000000..a2072e6d --- /dev/null +++ b/renovate.json5 @@ -0,0 +1,8 @@ +{ + "extends": [ + // Base config - https://github.com/giantswarm/renovate-presets/blob/main/default.json5 + "github>giantswarm/renovate-presets:default.json5", + // Go specific config - https://github.com/giantswarm/renovate-presets/blob/main/lang-go.json5 + "github>giantswarm/renovate-presets:lang-go.json5", + ], +}