Skip to content

Fix concourse SBOM jobs#5264

Merged
supersven merged 4 commits into
developfrom
sventennie/fix-concourse-sbom-jobs
Jun 12, 2026
Merged

Fix concourse SBOM jobs#5264
supersven merged 4 commits into
developfrom
sventennie/fix-concourse-sbom-jobs

Conversation

@supersven

@supersven supersven commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

2>&1 | grep -v warning merged stderr into stdout, mixing nix warnings into the mapfile expression. Result: devShell/image name list polluted with non-name lines from stderr.

Drop the redirect so stdout carries only names and stderr stays separate.

This PR fixes the related jobs on CI and was tested there.

Ticket: https://wearezeta.atlassian.net/browse/WPB-26357

Checklist

  • Add a new entry in an appropriate subdirectory of changelog.d
  • Read and follow the PR guidelines

If there is stderr output in the expression to get devshell_names, these
were cluttered. Fix that by keeping the streams separate.
@supersven supersven requested a review from Copilot June 11, 2026 17:55
@zebot zebot added the ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist label Jun 11, 2026
@supersven supersven force-pushed the sventennie/fix-concourse-sbom-jobs branch from 6f935fc to 50f3371 Compare June 11, 2026 17:56

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

This PR fixes Concourse SBOM generation job scripts by preventing Nix warnings on stderr from being merged into stdout, which previously polluted the parsed devShell/image name lists (and could also drop lines via grep -v warning).

Changes:

  • Remove 2>&1 | grep -v warning from nix eval calls that feed mapfile, keeping stdout strictly to the intended newline-separated names.
  • Add an internal changelog entry describing the CI/SBOM job fix.

Reviewed changes

Copilot reviewed 1 out of 3 changed files in this pull request and generated 1 comment.

File Description
hack/bin/create-nix-docker-image-sboms.sh Stops merging/filtering stderr during image name discovery for SBOM generation.
hack/bin/create-nix-devshell-sbom.sh Stops merging/filtering stderr during devShell name discovery for SBOM generation.
changelog.d/5-internal/fix-concourse-sbom-jobs Documents the SBOM job/script fix in the internal changelog.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread changelog.d/5-internal/fix-concourse-sbom-jobs Outdated

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 1 out of 3 changed files in this pull request and generated no new comments.

@supersven supersven marked this pull request as ready for review June 12, 2026 04:05
@supersven supersven requested review from a team as code owners June 12, 2026 04:05
@supersven supersven merged commit 1a9f634 into develop Jun 12, 2026
11 checks passed
@supersven supersven deleted the sventennie/fix-concourse-sbom-jobs branch June 12, 2026 07:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants