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.

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

[Backport release-24.11] GitHub Actions PRs #369914

Merged
merged 19 commits into from
Jan 3, 2025

Conversation

getchoo
Copy link
Member

@getchoo getchoo commented Jan 1, 2025

Similar in vein to #361168 and #362513, this is a backport of the QoL changes, fixes, and improvements to our CI from master

Most importantly, this backports the new rebuildsByPlatform comparison artifact schema that nixpkgs-review expects -- which the lack of currently makes it fail on all PRs targeting stable :(

And here's the obligatory big list of original PRs (feel free to double check I didn't miss anything!):

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.

Mic92 and others added 19 commits January 1, 2025 04:35
Update .github/workflows/check-nixf-tidy.yml

Co-authored-by: Zhong Jianxin <[email protected]>
(cherry picked from commit 2adf409)
(cherry picked from commit eeb8708)
saves a bit of CI time

(cherry picked from commit cb016f1)
(cherry picked from commit c318085)
Looks like the error message could be a bit clearer still: NixOS#337109 (comment)

(cherry picked from commit 249d4a9)
Bumps [korthout/backport-action](https://github.com/korthout/backport-action) from 3.0.2 to 3.1.0.
- [Release notes](https://github.com/korthout/backport-action/releases)
- [Commits](korthout/backport-action@bd410d3...be567af)

---
updated-dependencies:
- dependency-name: korthout/backport-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
(cherry picked from commit 8ba9615)
…System -> evalSystems)

(cherry picked from commit 6eadbf9)
Sometimes successful workflows trigger that condition,
see https://github.com/NixOS/nixpkgs/actions/runs/12278493443/job/34260660227:

    Comparing against "https://github.com/NixOS/nixpkgs/actions/runs/12278495895"
    Workflow not done, waiting 10 seconds before checking again
    Workflow was not successful, cannot make comparison

Even though

    $ gh api /repos/NixOS/nixpkgs/actions/runs/12278495895 --jq .conclusion
    success

Let's print the conclusion when it's not "success" to debug this.

(cherry picked from commit aae821d)
It's currently annoying to see the actual failure in the attrs step,
because `time -v` displays like 20 lines, which get repeated, therefore
requiring you to scroll up most of the time:
https://github.com/NixOS/nixpkgs/actions/runs/12290298121/job/34297218345#step:5:794

This commit fixes that by only displaying the most important stats, the
same ones as the chunked system-specific evals.

(cherry picked from commit bd5c93c)
Sometimes the conclusion is empty when it's still
running/pending or so, which needs to be caught, otherwise it can exit
preemptively: NixOS#364308 (comment)

Co-Authored-By: Reno Dakota <[email protected]>
(cherry picked from commit 79dca9a)
Failing fast hides system-specific evaluation failures, because all of
the currently 4 jobs appear as failed.

(cherry picked from commit a9dbb26)
Bumps [actions/create-github-app-token](https://github.com/actions/create-github-app-token) from 1.11.0 to 1.11.1.
- [Release notes](https://github.com/actions/create-github-app-token/releases)
- [Commits](actions/create-github-app-token@5d869da...c1a2851)

---
updated-dependencies:
- dependency-name: actions/create-github-app-token
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
(cherry picked from commit 4c4e933)
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.4.3 to 4.5.0.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@b4b15b8...6f51ac0)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
(cherry picked from commit abd256e)
Currently ofborg does this, but there is actually no real reason this
shouldn't be done by CI

(cherry picked from commit 6d96c9a)
@github-actions github-actions bot added 6.topic: policy discussion 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions labels Jan 1, 2025
@getchoo
Copy link
Member Author

getchoo commented Jan 1, 2025

$ git diff origin/master -- .github/workflows
diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml
index 08570d60e1d4..919d927cdbb4 100644
--- a/.github/workflows/periodic-merge-24h.yml
+++ b/.github/workflows/periodic-merge-24h.yml
@@ -35,10 +35,10 @@ jobs:
         pairs:
           - from: master
             into: haskell-updates
-          - from: release-24.11
-            into: staging-next-24.11
-          - from: staging-next-24.11
-            into: staging-24.11
+          - from: release-24.05
+            into: staging-next-24.05
+          - from: staging-next-24.05
+            into: staging-24.05
     name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
$ git diff origin/master -- ci/ ':!ci/OWNERS'
diff --git a/ci/request-reviews/dev-branches.txt b/ci/request-reviews/dev-branches.txt
index 9e0609e325ec..b34092546f18 100644
--- a/ci/request-reviews/dev-branches.txt
+++ b/ci/request-reviews/dev-branches.txt
@@ -6,4 +6,3 @@ staging
 release-*
 staging-*
 haskell-updates
-python-updates

@github-actions github-actions bot added the 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin label Jan 1, 2025
@github-actions github-actions bot added the 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux label Jan 1, 2025
@getchoo
Copy link
Member Author

getchoo commented Jan 1, 2025

(Limited) test run at getchoo-contrib#16

@wolfgangwalther
Copy link
Contributor

We now have #366046 and soon #370186 as well.

Copy link
Member

@infinisil infinisil left a comment

Choose a reason for hiding this comment

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

Kind of a pain to have to backport all of these all the time, but for now the only way

Thanks!

@infinisil infinisil merged commit 2aa4fe3 into NixOS:release-24.11 Jan 3, 2025
22 of 23 checks passed
@getchoo getchoo deleted the backport-24.11/ci/alot branch January 3, 2025 04:32
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: policy discussion 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.

7 participants