Merge remote-tracking branch 'origin/main' into add-v6-to-manager

Signed-off-by: Alex Goodman <[email protected]>
anchore · Jan 23, 2025 · 66f9696 · 66f9696
2 parents 1072377 + 45db3aa
commit 66f9696
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/.binny.yaml b/.binny.yaml
@@ -70,3 +70,11 @@ tools:
     method: github-release
     with:
       repo: oras-project/oras
+
+  - name: crane
+    version:
+      want: v0.20.3
+    method: go-install
+    with:
+      module: github.com/google/go-containerregistry
+      entrypoint: cmd/crane
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -17,7 +17,7 @@ updates:
       - "dependencies"
 
   - package-ecosystem: "github-actions"
-    directory: "/.github/actions/boostrap"
+    directory: "/.github/actions/bootstrap"
     schedule:
       interval: "daily"
     open-pull-requests-limit: 10

diff --git a/.github/workflows/update-bootstrap-tools.yml b/.github/workflows/update-bootstrap-tools.yml
@@ -16,7 +16,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
 
-      - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a #v5.2.0
+      - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 #v5.3.0
         with:
           go-version: ${{ env.GO_VERSION }}
           stable: ${{ env.GO_STABLE_VERSION }}

diff --git a/manager/src/grype_db_manager/cli/db.py b/manager/src/grype_db_manager/cli/db.py
@@ -248,7 +248,7 @@ def _validate_db(
             all_result_sets=True,
         )
     except:
-        if not validations_enabled and force:
+        if not validations_enabled and not force:
             click.echo(f"{Format.BOLD}{Format.OKGREEN}Validation disabled, ignoring failure{Format.RESET}")
             return
         raise