Align files (#394)

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

Hide file tree

Showing 12 changed files with 30 additions and 78 deletions.
diff --git 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
@@ -1,6 +1,6 @@
 # DO NOT EDIT. Generated with:
 #
-#    devctl@6.11.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
@@ -1,6 +1,6 @@
 # DO NOT EDIT. Generated with:
 #
-#    devctl@6.11.0
+#    devctl@6.14.0
 #
 name: Create Release
 on:
@@ -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

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.11.0
+#    devctl@6.14.0
 #
 name: Create Release PR
 on:
@@ -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
@@ -1,6 +1,6 @@
 # DO NOT EDIT. Generated with:
 #
-#    devctl@6.11.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/.nancy-ignore b/.nancy-ignore
@@ -1,21 +1,24 @@
 # pkg:golang/github.com/hashicorp/consul/[email protected]
-CVE-2022-29153 until=2023-09-30
+CVE-2022-29153 until=2024-01-31
 
 # pkg:golang/github.com/kataras/iris/[email protected]
-CVE-2021-23772 until=2023-09-30
+CVE-2021-23772 until=2024-01-31
 
 # pkg:golang/github.com/microcosm-cc/[email protected]
-CVE-2021-42576 until=2023-09-30
+CVE-2021-42576 until=2024-01-31
 
 # pkg:golang/github.com/nats-io/[email protected]
-CVE-2020-26892 until=2023-09-30
-CVE-2021-3127 until=2023-09-30
+CVE-2020-26892 until=2024-01-31
+CVE-2021-3127 until=2024-01-31
+
+# pkg:golang/golang.org/x/[email protected]
+CVE-2023-39325 until=2024-01-31
 
 # pkg:golang/github.com/urfave/[email protected]
 sonatype-2021-1485
 
 # pkg:golang/golang.org/x/[email protected]
-CVE-2023-3978 until=2023-09-30
+CVE-2023-3978 until=2024-01-31
 
 # pkg:golang/k8s.io/[email protected]
-CVE-2020-8561 until=2023-09-30
+CVE-2020-8561 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.11.0
+#    devctl@6.14.0
 #
 
 include Makefile.*.mk

diff --git a/Makefile.gen.app.mk b/Makefile.gen.app.mk
@@ -1,6 +1,6 @@
 # DO NOT EDIT. Generated with:
 #
-#    devctl@6.11.0
+#    devctl@6.14.0
 #
 
 ##@ App

diff --git a/Makefile.gen.go.mk b/Makefile.gen.go.mk
@@ -1,6 +1,6 @@
 # DO NOT EDIT. Generated with:
 #
-#    devctl@6.11.0
+#    devctl@6.14.0
 #
 
 APPLICATION    := $(shell go list -m | cut -d '/' -f 3)

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",
+  ],
+}