Merge branch 'main' into renovate/sigs.k8s.io-controller-runtime-0.x

validator-labs · Jun 5, 2024 · 8791da8 · 8791da8
2 parents 9f2e101 + 0e572f5
commit 8791da8
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/.github/workflows/bulwark-golicences.yaml b/.github/workflows/bulwark-golicences.yaml
@@ -11,20 +11,20 @@ concurrency:
 jobs:
   golicense-pr-scan:
     runs-on: [self-hosted, Linux, X64, validator]
+    container:
+      image: gcr.io/spectro-images-public/golang:1.22-alpine
     steps:
-      - name: install-git
-        run: sudo apt-get install -y git
-
       - name: checkout
         uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
 
       - name: Set up Go
         uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5
         with:
+          cache: false
           go-version-file: go.mod
 
       - name: install-golicenses
-        run: go install github.com/google/go-licenses@v1.0.0
+        run: go install github.com/google/go-licenses@latest
 
       - name: golicense-scan
         run: |

diff --git a/.github/workflows/bulwark-gosec.yaml b/.github/workflows/bulwark-gosec.yaml
@@ -22,7 +22,8 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5
         with:
-          go-version: '1.21'
+          cache: false
+          go-version-file: go.mod
 
       - name: run-gosec-scan
         shell: sh

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -21,6 +21,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5
         with:
+          cache: false
           go-version-file: go.mod
 
       - name: Test

diff --git a/renovate.json b/renovate.json
@@ -11,6 +11,11 @@
     "gomodMassage"
   ],
   "packageRules": [
+    {
+      "matchUpdateTypes": ["pin", "pinDigest", "digest"],
+      "addLabels": ["pin"],
+      "automerge": true
+    },
     {
       "matchUpdateTypes": ["minor", "patch"],
       "matchCurrentVersion": "!/^0/",
@@ -26,10 +31,25 @@
       "addLabels": ["github_actions"],
       "automerge": true
     },
+    {
+      "matchManagers": ["crossplane"],
+      "addLabels": ["crossplane"],
+      "automerge": true
+    },
     {
       "matchManagers": ["dockerfile"],
       "addLabels": ["docker"],
       "automerge": true
+    },
+    {
+      "matchManagers": ["kustomize"],
+      "addLabels": ["kustomize"],
+      "automerge": true
+    },
+    {
+      "matchManagers": ["helm-values"],
+      "addLabels": ["helm_values"],
+      "automerge": true
     }
   ],
   "regexManagers": [