Align files (#830)

* Align files * Update .nancy-ignore --------- Co-authored-by: github-actions <[email protected]> Co-authored-by: Laszlo Uveges <[email protected]>
giantswarm · Oct 26, 2023 · 83b4f29 · 83b4f29
1 parent bce7c75
commit 83b4f29
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 74 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  architect: giantswarm/architect@4.31.0
+  architect: giantswarm/architect@4.33.0
 
 workflows:
   go-build:

diff --git 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
@@ -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
@@ -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
@@ -2,7 +2,7 @@
 
 # DO NOT EDIT. Generated with:
 #
-#    devctl@6.13.0
+#    devctl@6.14.0
 #
 
 APPLICATION=$1

diff --git a/.nancy-ignore b/.nancy-ignore
@@ -1,17 +1,20 @@
 # The Hashicorp consul /sdk and /api libraries are no longer intended for public use.
 # Excluding them until dependencies move away.
-CVE-2022-29153 until=2023-08-31
-CVE-2022-24687 until=2023-08-31
+CVE-2022-29153 until=2024-01-31
+CVE-2022-24687 until=2024-01-31
 
 # pkg:golang/github.com/caddyserver/[email protected]
-CVE-2022-29718 until=2023-08-31
+CVE-2022-29718 until=2024-01-31
 
 # pkg:golang/github.com/lucas-clemente/[email protected]
-CVE-2022-30591 until=2023-08-31
+CVE-2022-30591 until=2024-01-31
 
 # pkg:golang/k8s.io/[email protected]
 # There is no fix yet
-CVE-2020-8561 until=2023-08-31
+CVE-2020-8561 until=2024-01-31
+
+# pkg:golang/golang.org/x/[email protected]
+CVE-2023-39325 until=2024-01-31
 
 # pkg:golang/google.golang.org/[email protected]
-CVE-2023-32731 until=2023-08-31
+CVE-2023-32731 until=2024-01-31
diff --git 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
@@ -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.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
diff --git a/renovate.json5 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",
+  ],
+}