Skip to content
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

Jump to bottom

nixos/github-runners: Make 'enable' functional #342996

Merged
merged 1 commit into from
Oct 16, 2024
Merged

nixos/github-runners: Make 'enable' functional #342996

merged 1 commit into from
Oct 16, 2024

Conversation

chreekat
Copy link
Contributor

Description of changes

Previously, the 'enable' attribute was ignored. Now, it isn't.

Fixes #305304

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: haskell 8.has: module (update) This PR changes an existing module in `nixos/` labels Sep 19, 2024
@chreekat chreekat mentioned this pull request Sep 19, 2024
Closed
@maralorn
Copy link
Member

🤣 I think I have never seen this mistake before. You, sir, are living too much in the Haskell world. 😆
Please cherry-pick your change onto master (instead of basing it on haskell-updates like you did) and push the result onto this branch. Then this PR should be fine again. Since your mistake only subscribed sterni and me I guess it’s fine to continue with this PR.

@maralorn
Copy link
Member

Ah, and maybe put this into draft mode until the diff is correct to avoid further mishaps.

@chreekat chreekat changed the title nixos/github-runners: Make 'enable' functional Draft: nixos/github-runners: Make 'enable' functional Sep 20, 2024
@chreekat
Copy link
Contributor Author

chreekat commented Sep 20, 2024 •
edited
Loading

Hahaha oops. I just blasted over to my base nixpkgs clone while waiting for docker images to build on another project and didn't pay enough attention. I'll fix it in a bit.

@chreekat
Copy link
Contributor Author

Thanks, autocorrect! Lol

@chreekat chreekat force-pushed the b/github-runner-enable-disable branch from 7d8858d to 588b1f8 Compare September 20, 2024 06:09
@chreekat chreekat changed the title Draft: nixos/github-runners: Make 'enable' functional nixos/github-runners: Make 'enable' functional Sep 20, 2024
@chreekat
Copy link
Contributor Author

@aanderse , sorry for the earlier mess on this PR! :) Hopefully you hadn't even looked at it yet. It should be ready now.

aanderse
aanderse approved these changes Oct 16, 2024
View reviewed changes
Copy link
Member

@aanderse aanderse left a comment

Choose a reason for hiding this comment

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

sorry @chreekat ... somehow this fell off my radar

thanks for the fix!

@aanderse aanderse merged commit 2ab323a into NixOS:master Oct 16, 2024
28 checks passed
@chreekat chreekat deleted the b/github-runner-enable-disable branch October 16, 2024 08:28
@chreekat
Copy link
Contributor Author

No problem! 👍🏻

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aanderse aanderse aanderse approved these changes

@sternenseemann sternenseemann Awaiting requested review from sternenseemann

@maralorn maralorn Awaiting requested review from maralorn

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: clean-up 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

github-runner: <name>.enable has no effect
3 participants
@chreekat @maralorn @aanderse