-
-
Notifications
You must be signed in to change notification settings - Fork 17.3k
[Backport release-24.11] GitHub Actions PRs #369914
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
Merged
infinisil
merged 19 commits into
NixOS:release-24.11
from
getchoo-contrib:backport-24.11/ci/alot
Jan 3, 2025
Merged
[Backport release-24.11] GitHub Actions PRs #369914
infinisil
merged 19 commits into
NixOS:release-24.11
from
getchoo-contrib:backport-24.11/ci/alot
Jan 3, 2025
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit b998723)
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)
(cherry picked from commit f94b4bd)
(cherry picked from commit 214cb79)
(cherry picked from commit 518ae8f)
…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)
(cherry picked from commit 44dc31e)
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)
Member
Author
$ 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 |
Member
Author
|
(Limited) test run at getchoo-contrib#16 |
Contributor
infinisil
approved these changes
Jan 3, 2025
Member
infinisil
left a comment
There was a problem hiding this 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!
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
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Similar in vein to #361168 and #362513, this is a backport of the QoL changes, fixes, and improvements to our CI from
masterMost importantly, this backports the new
rebuildsByPlatformcomparison artifact schema thatnixpkgs-reviewexpects -- 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!):
shell.nixor./ci/**is changed #360249ci/**path #360283Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.