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

action, selftest: deprecate bundle-only: false #65

Merged
merged 2 commits into from
Apr 23, 2023
Merged

action, selftest: deprecate bundle-only: false #65

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
249609a
action, selftest: deprecate `bundle-only: false``
tnytown Apr 23, 2023
61a174d
action, release: remove `bundle-only`
tnytown Apr 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .github/workflows/selftest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ jobs:
inputs: ./test/artifact.txt
- name: Check outputs
run: |
[[ -f ./test/artifact.txt.sig ]] || exit 1
[[ -f ./test/artifact.txt.crt ]] || exit 1
[[ -f ./test/artifact.txt.sigstore ]] || exit 1

selftest-xfail-invalid-inputs:
Expand Down Expand Up @@ -67,8 +65,6 @@ jobs:
staging: true
- name: Check outputs
run: |
[[ -f ./test/artifact.txt.sig ]] || exit 1
[[ -f ./test/artifact.txt.crt ]] || exit 1
[[ -f ./test/artifact.txt.sigstore ]] || exit 1

selftest-glob:
Expand Down Expand Up @@ -102,8 +98,6 @@ jobs:
- name: Verify presence of uploaded files
run: |
[[ -f ./artifact.txt ]] || exit 1
[[ -f ./artifact.txt.sig ]] || exit 1
[[ -f ./artifact.txt.crt ]] || exit 1
[[ -f ./artifact.txt.sigstore ]] || exit 1
working-directory: ./test/uploaded

Expand Down
8 changes: 4 additions & 4 deletions action.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,10 @@ def _fatal_help(msg):
inputs.append(artifact)

bundle_only = os.getenv("GHA_SIGSTORE_PYTHON_BUNDLE_ONLY") == "true"
if not bundle_only:
_fatal_help("`bundle-only` is deprecated, this action no longer emits"
" other outputs by default")
Copy link
Member

Choose a reason for hiding this comment

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

Actually, thinking about this more: let's just remove this option entirely, since we're doing a major bump.

(Sorry for the whiplash!)


for input_ in inputs:
# Forbid things that look like flags. This isn't a security boundary; just
# a way to prevent (less motivated) users from breaking the action on themselves.
Expand All @@ -206,10 +210,6 @@ def _fatal_help(msg):
# Also upload artifact being signed for.
signing_artifact_paths.append(str(file_))

if not bundle_only and "--certificate" not in sigstore_sign_args:
signing_artifact_paths.append(f"{file_}.crt")
if not bundle_only and "--signature" not in sigstore_sign_args:
signing_artifact_paths.append(f"{file_}.sig")
if "--bundle" not in sigstore_sign_args:
signing_artifact_paths.append(f"{file_}.sigstore")

Expand Down