Merge branch 'main' into renovate/main-actions-cache-digest

redhat-developer · Oct 10, 2024 · c424b15 · c424b15
2 parents 5db32b2 + 4493e2c
commit c424b15
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 17 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -57,7 +57,8 @@
       ],
       "matchUpdateTypes": [
         "minor",
-        "patch"
+        "patch",
+        "digest"
       ],
       "baseBranches": [
         "main"
@@ -79,7 +80,8 @@
         "go"
       ],
       "matchUpdateTypes": [
-        "patch"
+        "patch",
+        "digest"
       ],
       "baseBranches": [
         "/^release-1\\..*/",
@@ -95,8 +97,8 @@
       ]
     },
     {
-      "description": "ginkgo: minor and patch updates in main",
-      "enabled": true,
+      "description": "ginkgo: minor and patch updates in main (disabled until we support Go 1.22+, which is required since ginkgo 2.20.2)",
+      "enabled": false,
       "groupName": "ginkgo main",
       "matchDatasources": [
         "go"
@@ -114,8 +116,8 @@
       ]
     },
     {
-      "description": "ginkgo: patch updates only in 1.y",
-      "enabled": true,
+      "description": "ginkgo: patch updates only in 1.y (disabled until we support Go 1.22+, which is required since ginkgo 2.20.2)",
+      "enabled": false,
       "groupName": "ginkgo 1.y",
       "matchDatasources": [
         "go"
@@ -133,8 +135,8 @@
       ]
     },
     {
-      "description": "gomega: minor and patch updates in main",
-      "enabled": true,
+      "description": "gomega: minor and patch updates in main (disabled until we support Go 1.22+, which is required since gomega 1.34.2)",
+      "enabled": false,
       "groupName": "gomega main",
       "matchDatasources": [
         "go"
@@ -152,8 +154,8 @@
       ]
     },
     {
-      "description": "gomega: patch updates only in 1.y",
-      "enabled": true,
+      "description": "gomega: patch updates only in 1.y (disabled until we support Go 1.22+, which is required since gomega 1.34.2)",
+      "enabled": false,
       "groupName": "gomega 1.y",
       "matchDatasources": [
         "go"

diff --git a/.github/workflows/next-container-build.yaml b/.github/workflows/next-container-build.yaml
@@ -25,7 +25,7 @@ jobs:
       packages: write
     steps:
       - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
         with:
           fetch-depth: 0
 

diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
@@ -24,7 +24,7 @@ jobs:
     env:
       CONTAINER_ENGINE: podman
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 # default branch will be checked out by default on scheduled workflows
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4 # default branch will be checked out by default on scheduled workflows
         with:
           fetch-depth: 0
 

diff --git a/.github/workflows/pr-bundle-diff-checks.yaml b/.github/workflows/pr-bundle-diff-checks.yaml
@@ -36,7 +36,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
         with:
           fetch-depth: 0
           repository: ${{github.event.pull_request.head.repo.full_name}}

diff --git a/.github/workflows/pr-container-build.yaml b/.github/workflows/pr-container-build.yaml
@@ -46,7 +46,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
         with:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.ref }}

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
         with:
           fetch-depth: 0
 
@@ -75,7 +75,7 @@ jobs:
         run: make gosec
 
       - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3
+        uses: github/codeql-action/upload-sarif@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3
         with:
           # Path to SARIF file relative to the root of the repository
           sarif_file: gosec.sarif
diff --git a/.github/workflows/renovate-checks.yaml b/.github/workflows/renovate-checks.yaml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Renovate Config Validator
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
       - name: Validate config
         # See https://docs.renovatebot.com/config-validation/
         run: |