Skip to content

Commit 9247cf3

Browse files
authored
action, selftest: deprecate bundle-only: false (#65)
* action, selftest: deprecate `bundle-only: false`` Signed-off-by: Andrew Pan <[email protected]> * action, release: remove `bundle-only` Signed-off-by: Andrew Pan <[email protected]> --------- Signed-off-by: Andrew Pan <[email protected]>
1 parent e323e1b commit 9247cf3

File tree

5 files changed

+0
-43
lines changed

5 files changed

+0
-43
lines changed

.github/workflows/release.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,3 @@ jobs:
2424
with:
2525
inputs: action.yml action.py
2626
release-signing-artifacts: true
27-
bundle-only: true

.github/workflows/selftest.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ jobs:
2323
inputs: ./test/artifact.txt
2424
- name: Check outputs
2525
run: |
26-
[[ -f ./test/artifact.txt.sig ]] || exit 1
27-
[[ -f ./test/artifact.txt.crt ]] || exit 1
2826
[[ -f ./test/artifact.txt.sigstore ]] || exit 1
2927
3028
selftest-xfail-invalid-inputs:
@@ -67,8 +65,6 @@ jobs:
6765
staging: true
6866
- name: Check outputs
6967
run: |
70-
[[ -f ./test/artifact.txt.sig ]] || exit 1
71-
[[ -f ./test/artifact.txt.crt ]] || exit 1
7268
[[ -f ./test/artifact.txt.sigstore ]] || exit 1
7369
7470
selftest-glob:
@@ -102,8 +98,6 @@ jobs:
10298
- name: Verify presence of uploaded files
10399
run: |
104100
[[ -f ./artifact.txt ]] || exit 1
105-
[[ -f ./artifact.txt.sig ]] || exit 1
106-
[[ -f ./artifact.txt.crt ]] || exit 1
107101
[[ -f ./artifact.txt.sigstore ]] || exit 1
108102
working-directory: ./test/uploaded
109103

README.md

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -388,29 +388,6 @@ permissions:
388388
release-signing-artifacts: true
389389
```
390390

391-
### `bundle-only`
392-
393-
**Default**: `false`
394-
395-
The `bundle-only` setting controls whether or not `sigstore-python` uploads `.crt`
396-
or `.sig` artifacts.
397-
398-
This setting affects the behavior of the `upload-signing-artifacts` and `release-signing-artifacts`
399-
settings. If neither of those settings are specified, this setting has no effect.
400-
401-
By default, `.crt` and `.sig` artifacts are uploaded. If enabled, only the `.sigstore`
402-
signing artifact is uploaded.
403-
404-
Example:
405-
406-
```yaml
407-
- uses: sigstore/[email protected]
408-
with:
409-
inputs: file.txt
410-
upload-signing-artifacts: true
411-
bundle-only: true
412-
```
413-
414391
### Internal options
415392
<details>
416393
<summary>⚠️ Internal options ⚠️</summary>

action.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@ def _fatal_help(msg):
190190
if artifact is not None:
191191
inputs.append(artifact)
192192

193-
bundle_only = os.getenv("GHA_SIGSTORE_PYTHON_BUNDLE_ONLY") == "true"
194193
for input_ in inputs:
195194
# Forbid things that look like flags. This isn't a security boundary; just
196195
# a way to prevent (less motivated) users from breaking the action on themselves.
@@ -206,10 +205,6 @@ def _fatal_help(msg):
206205
# Also upload artifact being signed for.
207206
signing_artifact_paths.append(str(file_))
208207

209-
if not bundle_only and "--certificate" not in sigstore_sign_args:
210-
signing_artifact_paths.append(f"{file_}.crt")
211-
if not bundle_only and "--signature" not in sigstore_sign_args:
212-
signing_artifact_paths.append(f"{file_}.sig")
213208
if "--bundle" not in sigstore_sign_args:
214209
signing_artifact_paths.append(f"{file_}.sigstore")
215210

action.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,6 @@ inputs:
9090
description: "attach all signing artifacts as release assets"
9191
required: false
9292
default: false
93-
bundle-only:
94-
description: |
95-
upload only the Sigstore bundle
96-
97-
has no effect if `upload-signing-artifacts` or `release-signing-artifacts` is not enabled
98-
required: false
99-
default: false
10093
internal-be-careful-debug:
10194
description: "run with debug logs (default false)"
10295
required: false
@@ -131,7 +124,6 @@ runs:
131124
GHA_SIGSTORE_PYTHON_VERIFY_CERT_IDENTITY: "${{ inputs.verify-cert-identity }}"
132125
GHA_SIGSTORE_PYTHON_VERIFY_OIDC_ISSUER: "${{ inputs.verify-oidc-issuer }}"
133126
GHA_SIGSTORE_PYTHON_RELEASE_SIGNING_ARTIFACTS: "${{ inputs.release-signing-artifacts }}"
134-
GHA_SIGSTORE_PYTHON_BUNDLE_ONLY: "${{ inputs.bundle-only }}"
135127
GHA_SIGSTORE_PYTHON_INTERNAL_BE_CAREFUL_DEBUG: "${{ inputs.internal-be-careful-debug }}"
136128
shell: bash
137129

0 commit comments

Comments
 (0)