Skip to content

Commit

Permalink
Merge branch 'main' into renovate/gcr.io-distroless-base-nonroot
Browse files Browse the repository at this point in the history
  • Loading branch information
laurentsimon authored Feb 28, 2023
2 parents c430148 + 12910ea commit 8c1da39
Show file tree
Hide file tree
Showing 32 changed files with 157 additions and 34 deletions.
77 changes: 47 additions & 30 deletions actions/installer/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions actions/installer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
},
"devDependencies": {
"@types/jasmine": "4.3.1",
"@types/node": "18.14.0",
"@types/node": "18.14.2",
"@vercel/ncc": "0.36.1",
"eslint": "8.34.0",
"eslint": "8.35.0",
"eslint-plugin-github": "4.6.1",
"jasmine": "4.5.0",
"prettier": "2.8.4",
Expand Down
4 changes: 2 additions & 2 deletions cli/slsa-verifier/main_regression_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,7 @@ func Test_runVerifyGHAArtifactImage(t *testing.T) {
}

if err != nil {
return
continue
}

// Validate against test's expected builderID, if provided.
Expand All @@ -847,7 +847,7 @@ func Test_runVerifyGHAArtifactImage(t *testing.T) {
}

if bid == nil {
return
continue
}

// If we have a generated a user-provided bid, then validate it against the
Expand Down
Binary file not shown.
Loading

0 comments on commit 8c1da39

Please sign in to comment.