Skip to content

workflows: lock Ubuntu and macOS runners and update Ubuntu runner#368442

Merged
infinisil merged 3 commits intoNixOS:masterfrom
trueNAHO:workflows-lock-and-update-runner
Jan 5, 2025
Merged

workflows: lock Ubuntu and macOS runners and update Ubuntu runner#368442
infinisil merged 3 commits intoNixOS:masterfrom
trueNAHO:workflows-lock-and-update-runner

Conversation

@trueNAHO
Copy link
Member

@trueNAHO trueNAHO commented Dec 27, 2024

Lock the Ubuntu and macOS runners to avoid accidental updates 1 and increase reproduciblity. Then, update the Ubuntu runner to what ubuntu-latest will soon point to 1, which hopefully causes no problems on our end.

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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: policy discussion Discuss policies to work in and around Nixpkgs 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions labels Dec 27, 2024
@trueNAHO trueNAHO requested a review from Mic92 December 27, 2024 00:05
@github-actions github-actions bot added 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 Dec 27, 2024
Copy link
Contributor

@philiptaron philiptaron left a comment

Choose a reason for hiding this comment

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

Agree with this direction. Better than having it fault in over the next days. I'm not planning on merging this myself; I feel better having @infinisil or another watcher of the CIs merge.

@trueNAHO trueNAHO changed the title workflows: lock and update Ubuntu runner workflows: lock Ubuntu and macOS runner and update Ubuntu runner Dec 27, 2024
@trueNAHO trueNAHO changed the title workflows: lock Ubuntu and macOS runner and update Ubuntu runner workflows: lock Ubuntu and macOS runners and update Ubuntu runner Dec 27, 2024
@trueNAHO trueNAHO force-pushed the workflows-lock-and-update-runner branch from a744e50 to 2533b63 Compare December 27, 2024 01:14
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Dec 27, 2024
Copy link
Contributor

@drupol drupol left a comment

Choose a reason for hiding this comment

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

I was about to make such a PR :)

@wegank wegank added 12.approvals: 2 This PR was reviewed and approved by two persons. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. 2.status: merge conflict This PR has merge conflicts with the target branch labels Dec 29, 2024
@trueNAHO
Copy link
Member Author

trueNAHO commented Jan 4, 2025

For reference, the complementary PR NixOS/nix#12109 has been merged.

@trueNAHO trueNAHO force-pushed the workflows-lock-and-update-runner branch from 2533b63 to dbd20ce Compare January 4, 2025 23:20
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 4, 2025
@trueNAHO
Copy link
Member Author

trueNAHO commented Jan 4, 2025

I rebased this patchset on top of commit 90c106c ("simple64-netplay-server: 2024.12.2 -> 2024.12.3 (#370113)"), while incorporating the new "Periodic Merges (haskell-updates)" workflow introduced in commit f9f5325 ("workflows/periodic-merge: merge merge-base into haskell-updates").

@wegank wegank removed the 12.approvals: 2 This PR was reviewed and approved by two persons. label Jan 5, 2025
@infinisil infinisil merged commit 5e220d5 into NixOS:master Jan 5, 2025
21 of 25 checks passed
@wolfgangwalther
Copy link
Contributor

Backported in #370709.

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

Labels

6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions 6.topic: darwin Running or building packages on Darwin 6.topic: policy discussion Discuss policies to work in and around Nixpkgs 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. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants