Skip to content

Commit 6f7d34f

Browse files
dependabot[bot]jku
andauthored
build(deps): bump the actions group with 2 updates (#1537)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jussi Kukkonen <[email protected]>
1 parent 1630428 commit 6f7d34f

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

.github/workflows/conformance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: install sigstore-python
2727
run: python -m pip install .
2828

29-
- uses: sigstore/sigstore-conformance@a7ac671d8e55553de127c8b1ad96d8d416315e83 # v0.0.19
29+
- uses: sigstore/sigstore-conformance@1d8b0cdd88fa7fb5a8510e51faf6ccad8c96f10a # v0.0.20
3030
with:
3131
entrypoint: ${{ github.workspace }}/test/integration/sigstore-python-conformance
3232
xfail: "test_verify*intoto-with-custom-trust-root]" # see issue 1442

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129
# Confusingly, this action also supports updating releases, not
130130
# just creating them. This is what we want here, since we've manually
131131
# created the release that triggered the action.
132-
uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
132+
uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3
133133
with:
134134
# smoketest-artifacts/ contains the signatures and certificates.
135135
files: |

test/integration/sigstore-python-conformance

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,20 +59,34 @@ if "--staging" in fixed_args:
5959
command.append("--staging")
6060
fixed_args.remove("--staging")
6161

62-
# We may get "--trusted-root" as argument but sigstore-python wants "--trust-config":
62+
# We may get "--trusted-root" and "--signing-config" as argument but sigstore-python
63+
# wants "--trust-config":
6364
trusted_root_path = None
6465
with suppress(ValueError):
6566
i = fixed_args.index("--trusted-root")
6667
trusted_root_path = fixed_args[i + 1]
6768
fixed_args.pop(i)
6869
fixed_args.pop(i)
6970

71+
signing_config_path = None
72+
with suppress(ValueError):
73+
i = fixed_args.index("--signing-config")
74+
signing_config_path = fixed_args[i + 1]
75+
fixed_args.pop(i)
76+
fixed_args.pop(i)
77+
78+
7079
# If we did get a trustedroot, write a matching trustconfig into a temp file
80+
# Use given signingconfig if possible, otherwise use the fake one in template
7181
with NamedTemporaryFile(mode="wt") as temp_file:
7282
if trusted_root_path is not None:
7383
with open(trusted_root_path) as f:
7484
trusted_root = json.load(f)
7585
trust_config["trustedRoot"] = trusted_root
86+
if signing_config_path is not None:
87+
with open(signing_config_path) as f:
88+
signing_config = json.load(f)
89+
trust_config["signingConfig"] = signing_config
7690

7791
json.dump(trust_config, temp_file)
7892
temp_file.flush()

0 commit comments

Comments
 (0)