Skip to content

Backport #332 to release-2.5 - #353

Merged
adamwg merged 1 commit into
crossplane:release-2.5from
adamwg:backport-332-to-release-2.5
Oct 9, 2026
Merged

adamwg merged 1 commit into
crossplane:release-2.5from
adamwg:backport-332-to-release-2.5

Conversation

@adamwg

@adamwg adamwg commented Sep 10, 2026

Copy link
Copy Markdown
Member

Description of your changes

Manual backport of #332 to release-2.5. The only conflicts were in the deleted gomod2nix.toml.

I have:

@adamwg
adamwg requested review from a team, jcogilvie and tampakrap as code owners September 10, 2026 17:52
@adamwg
adamwg requested review from jbw976 and removed request for a team September 10, 2026 17:52
@adamwg
adamwg force-pushed the backport-332-to-release-2.5 branch from 620288d to 2f4af3f Compare October 9, 2026 16:54
Since we separated the CLI out of core Crossplane and copied its nix-based build
system, three significant build changes have happened in core:

1. We've started using nix's standard `buildGoModule` instead of `gomod2nix` in
   order to ensure the produced artifacts have necessary dependency data for
   security scanning (crossplane/crossplane#7549).

2. The nix build has been updated to give each build job its own writeable home
   directory, solving the `/homeless-shelter` errors we occaisionally see in CI
   (crossplane/crossplane#7652).

3. The nixpkgs channel has been updated to the latest 26.05 from the EOL 25.11
   (crossplane/crossplane#7715).

All of these changes are relevant improvements for the CLI build as well, so
port them over. This should make our renovate runs more reliable (they often hit
issue 2 today) and improve our security posture.

Signed-off-by: Adam Wolfe Gordon <awg@upbound.io>
(cherry picked from commit 2b043e1)
@adamwg
adamwg force-pushed the backport-332-to-release-2.5 branch from 2f4af3f to 6484df1 Compare October 9, 2026 17:05
@adamwg
adamwg merged commit de95c83 into crossplane:release-2.5 Oct 9, 2026
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants