Skip to content

[Backport release-21.11] release.nix: fix eval with aarch64-, but not x86_64-darwin supported#155370

Merged
sternenseemann merged 1 commit intorelease-21.11from
backport-154506-to-release-21.11
Jan 17, 2022
Merged

[Backport release-21.11] release.nix: fix eval with aarch64-, but not x86_64-darwin supported#155370
sternenseemann merged 1 commit intorelease-21.11from
backport-154506-to-release-21.11

Conversation

@github-actions
Copy link
Contributor

Bot-based backport to release-21.11, triggered by a label in #154506.

  • Before merging, ensure that this backport complies with the Criteria for Backporting.
    • Even as a non-commiter, if you find that it does not comply, leave a comment.

We emit a few jobs conditionally on supportDarwin which only checked for
x86_64-darwin in the past. This change makes it more modular by
transforming it into an attribute set which holds the two darwin
arches. Jobs needing aarch64-darwin or x86_64-darwin are now only
emitted if their respective platform is actually in supportedSystems.

This issue was discovered because the staging-next-21.11 jobset had
commented out x86_64-darwin (presumably due to a build load issue).

(cherry picked from commit 533eb98)
@github-actions github-actions bot requested review from domenkozar and vcunat January 17, 2022 13:35
@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jan 17, 2022
@sternenseemann sternenseemann merged commit 6afc3b1 into release-21.11 Jan 17, 2022
@sternenseemann sternenseemann deleted the backport-154506-to-release-21.11 branch January 17, 2022 15:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant