Skip to content

prepare: rename output component-descriptor -> component-descriptor-artefact #1645

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

Open
ccwienk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

prepare: rename output component-descriptor -> component-descriptor-artefact #1645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
description: |
name of the GHA artifact holding the base OCM Component-Descriptor
(use `merge-ocm-fragments` action to collect full component-descriptor):
value: ${{ jobs.prepare.outputs.component-descriptor }}
value: ${{ jobs.prepare.outputs.component-descriptor-artefact }}

jobs:
prepare:
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/prepare.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,15 +187,10 @@ on:
It is output using the `capture-commit` action, and can be imported using the
`import-commit` action.
value: release-commit-objects
component-descriptor:
description: |
The name of the GHA artifact holding the base OCM Component-Descriptor.
Deprecated: use component-descriptor-artefact instead.
value: ${{ jobs.version-and-ocm.outputs.component-descriptor }}
component-descriptor-artefact:
description: |
The name of the GHA artifact holding the base OCM Component-Descriptor.
value: ${{ jobs.version-and-ocm.outputs.component-descriptor }}
value: ${{ jobs.version-and-ocm.outputs.component-descriptor-artefact }}

jobs:
version-and-ocm:
Expand All @@ -213,7 +208,7 @@ jobs:
can-push: ${{ steps.params.outputs.can-push }}
version: ${{ steps.version.outputs.version }}
commit-digest: ${{ steps.version.outputs.commit-digest }}
component-descriptor: ${{ steps.component-descriptor.outputs.component-descriptor-artifact }}
component-descriptor-artefact: ${{ steps.component-descriptor.outputs.component-descriptor-artifact }}

@IndritFejza IndritFejza Jun 25, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I have noticed a mix of usage of british/american artefact and artifect in the wf/actions in this repo.

Would it make sense to unify all usages and use only 1 term?
As to no cause confusion.

That could potentially cause breaking changes ofc.

steps:
- name: params
id: params
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upgrade-dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ jobs:
- uses: gardener/cc-utils/.github/actions/ocm-upgrade@master
with:
component-descriptor: ${{ inputs.component-descriptor }}
component-descriptor-artifact: ${{ inputs.component-descriptor == '' && needs.prepare.outputs.component-descriptor || '' }}
component-descriptor-artifact: ${{ inputs.component-descriptor == '' && needs.prepare.outputs.component-descriptor-artefact || '' }}
ocm-repositories: |
${{ needs.prepare.outputs.ocm-repositories || inputs.ocm-repositories }}
github-token: ${{ steps.checkout.outputs.token }}
Expand Down
Loading