Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(deps): Update Sigstore Dep to Sigstore 2.2.2 #3491

Merged
merged 6 commits into from
Mar 28, 2024
Merged

fix(deps): Update Sigstore Dep to Sigstore 2.2.2 #3491

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
49c5def
Remove Sign Options and Bump to Sigstore 1.9
enteraga6 Mar 27, 2024
97917ee
update verify token and setup-generic to 1.9
enteraga6 Mar 27, 2024
abddee9
bump to 2.2.2
enteraga6 Mar 28, 2024
f52ab2f
try pre-submit test fix
enteraga6 Mar 28, 2024
bf228e1
pre-submit fix try #2: also change root version
enteraga6 Mar 28, 2024
a1bfa8f
presubmit fix attempt 3
enteraga6 Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4,094 changes: 2,381 additions & 1,713 deletions .github/actions/sign-attestations/dist/index.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .github/actions/sign-attestations/dist/index.js.map
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 22 additions & 8 deletions .github/actions/sign-attestations/package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion .github/actions/sign-attestations/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@actions/core": "1.10.1",
"@actions/github": "5.1.1",
"@sigstore/rekor-types": "1.0.0",
"sigstore": "1.8.0",
"sigstore": "1.9.0",
"tscommon": "file:../tscommon/tscommon-0.0.0.tgz"
}
}
7 changes: 1 addition & 6 deletions .github/actions/sign-attestations/src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ import { sigstore } from "sigstore";
import * as path from "path";
import * as tscommon from "tscommon";

const signOptions = {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these now default params in v1.9?

Copy link
Collaborator Author

@enteraga6 enteraga6 Mar 27, 2024 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, in v1.9 it defaults to CI provider when no other strategy has been configured, instead of defaulting as the first strategy like before in v1.8. Removing signOptions, lets it fallback to CI provider to get OIDC token for GHA.

You can see that change here: https://github.com/sigstore/sigstore-js/blob/sigstore%401.9.0/packages/client/src/config.ts#L130-L139

oidcClientID: "sigstore",
oidcIssuer: "https://oauth2.sigstore.dev/auth",
};

async function run(): Promise<void> {
try {
/* Test locally:
Expand All @@ -46,7 +41,7 @@ async function run(): Promise<void> {
if (stat.isFile()) {
core.debug(`Signing ${fpath}...`);
const buffer = tscommon.safeReadFileSync(fpath);
const bundle = await sigstore.attest(buffer, payloadType, signOptions);
const bundle = await sigstore.attest(buffer, payloadType);
const bundleStr = JSON.stringify(bundle);
const outputPath = path.join(
outputFolder,
Expand Down