-
Notifications
You must be signed in to change notification settings - Fork 7
ci: fix issues with job naming when sequences are involved #979
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.
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
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -34,11 +34,13 @@ on: | |||||
| type: string | ||||||
| outputs: | ||||||
| fully-qualified-image-name: | ||||||
| value: ${{ jobs.sanitize-image-name.outputs.fully-qualified-image-name }} | ||||||
| value: ${{ jobs.sanitize-inputs.outputs.fully-qualified-image-name }} | ||||||
| image-basename: | ||||||
| value: ${{ jobs.sanitize-image-name.outputs.image-basename }} | ||||||
| value: ${{ jobs.sanitize-inputs.outputs.image-basename }} | ||||||
| digest: | ||||||
| value: ${{ jobs.merge-image.outputs.digest }} | ||||||
| runner-arch: | ||||||
| value: ${{ jobs.sanitize-inputs.outputs.runner-arch }} | ||||||
| secrets: | ||||||
| DOCKER_REGISTRY_USERNAME: | ||||||
| required: true | ||||||
|
|
@@ -48,21 +50,21 @@ on: | |||||
| permissions: {} | ||||||
|
|
||||||
| jobs: | ||||||
| sanitize-image-name: | ||||||
| sanitize-inputs: | ||||||
| name: 🧼 | ||||||
| uses: ./.github/workflows/wc-sanitize-image-name.yml | ||||||
| uses: ./.github/workflows/wc-sanitize-inputs.yml | ||||||
| with: | ||||||
| image-name: ${{ inputs.image-name }} | ||||||
| registry: ${{ inputs.registry }} | ||||||
| runner-labels: ${{ inputs.runner-labels }} | ||||||
|
|
||||||
| build-push: | ||||||
| name: ${{ matrix.runner }} | ||||||
| name: Build (${{ needs.sanitize-inputs.outputs.runner-arch }}) | ||||||
| strategy: | ||||||
| matrix: | ||||||
| runner: ${{ (startsWith(inputs.build-test-runner-labels, '[') && endsWith(inputs.build-test-runner-labels, ']')) && fromJson(inputs.build-test-runner-labels) || inputs.build-test-runner-labels }} | ||||||
| runs-on: ${{ matrix.runner }} | ||||||
| needs: sanitize-image-name | ||||||
| needs: sanitize-inputs | ||||||
| permissions: | ||||||
| contents: read | ||||||
| packages: write | ||||||
|
|
@@ -87,7 +89,7 @@ jobs: | |||||
| DOCKER_METADATA_SET_OUTPUT_ENV: false | ||||||
| id: metadata | ||||||
| with: | ||||||
| images: ${{ needs.sanitize-image-name.outputs.fully-qualified-image-name }} | ||||||
| images: ${{ needs.sanitize-inputs.outputs.fully-qualified-image-name }} | ||||||
| - name: Generate image label for devcontainer.metadata | ||||||
| run: | | ||||||
| set -Eeuo pipefail | ||||||
|
|
@@ -105,16 +107,14 @@ jobs: | |||||
| id: devcontainer-metadata | ||||||
| - run: echo "git-commit-epoch=$(git log -1 --pretty=%ct)" >> "$GITHUB_OUTPUT" | ||||||
| id: devcontainer-epoch | ||||||
| - run: echo "arch=$(echo "${RUNNER_ARCH}" | tr '[:upper:]' '[:lower:]')" >> "$GITHUB_OUTPUT" | ||||||
| id: devcontainer-arch | ||||||
| - uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0 | ||||||
| id: build-and-push | ||||||
| env: | ||||||
| SOURCE_DATE_EPOCH: ${{ steps.devcontainer-epoch.outputs.git-commit-epoch }} | ||||||
| with: | ||||||
| file: ${{ inputs.dockerfile }} | ||||||
| push: true | ||||||
| tags: ${{ needs.sanitize-image-name.outputs.fully-qualified-image-name }} | ||||||
| tags: ${{ needs.sanitize-inputs.outputs.fully-qualified-image-name }} | ||||||
| labels: | | ||||||
| ${{ steps.metadata.outputs.labels }} | ||||||
| ${{ steps.devcontainer-metadata.outputs.label }} | ||||||
|
|
@@ -130,19 +130,17 @@ jobs: | |||||
| DIGEST: ${{ steps.build-and-push.outputs.digest }} | ||||||
| - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 | ||||||
| with: | ||||||
| name: digests-${{ needs.sanitize-image-name.outputs.image-basename }}-${{ steps.devcontainer-arch.outputs.arch }} | ||||||
| name: digests-${{ needs.sanitize-inputs.outputs.image-basename }}-${{ needs.sanitize-inputs.outputs.runner-arch }} | ||||||
|
||||||
| name: digests-${{ needs.sanitize-inputs.outputs.image-basename }}-${{ needs.sanitize-inputs.outputs.runner-arch }} | |
| name: digests-${{ needs.sanitize-inputs.outputs.image-basename }}-${{ matrix.runner }} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,5 +1,5 @@ | ||||||
| --- | ||||||
| name: Sanitize Image Name | ||||||
| name: Sanitize Inputs | ||||||
|
|
||||||
| on: | ||||||
| workflow_call: | ||||||
|
|
@@ -15,31 +15,38 @@ on: | |||||
| type: string | ||||||
| outputs: | ||||||
| image-basename: | ||||||
| description: "The sanitized base name of the image (without registry or tag)" | ||||||
| description: "The sanitized base name of the image" | ||||||
|
||||||
| description: "The sanitized base name of the image" | |
| description: "The sanitized base name of the image (excluding registry and tag)" |
Copilot
AI
Oct 16, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This description no longer states that the tag and registry are excluded, which can lead to misuse when composing full image references. Suggest: The sanitized image name (repository path without registry or tag).
Suggested change
| description: "The sanitized name of the image" | |
| description: "The sanitized image name (repository path without registry or tag)" |
Copilot
AI
Oct 16, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The previous wording clarified that the tag was not included; current phrasing could imply tags are present. Suggest: The fully qualified image name including registry (no tag).
Suggested change
| description: "The fully qualified name of the image including registry" | |
| description: "The fully qualified image name including registry (no tag)" |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using a single runner-arch value from the sanitize job for every matrix entry can mislabel builds when matrix runners differ (e.g. mixing x64 and arm64), leading to misleading job names. Compute architecture within each matrix job (using RUNNER_ARCH) or incorporate matrix.runner into the name to ensure accuracy.