Skip to content

ci: Dogfood Nix from master (backport #13473)#13537

Merged
xokdvium merged 3 commits into2.29-maintenancefrom
mergify/bp/2.29-maintenance/pr-13473
Jul 24, 2025
Merged

ci: Dogfood Nix from master (backport #13473)#13537
xokdvium merged 3 commits into2.29-maintenancefrom
mergify/bp/2.29-maintenance/pr-13473

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jul 24, 2025

Motivation

This would allow us to catch bugs (especially MacOS ones) much earlier before release.

Context

Resolves #12462

Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.

This is an automatic backport of pull request #13473 done by [Mergify](https://mergify.com).

@mergify mergify bot added the automatic backport This PR is a backport produced by automation (does not trigger backporting) label Jul 24, 2025
@mergify mergify bot requested a review from edolstra as a code owner July 24, 2025 17:09
@mergify mergify bot added the conflicts label Jul 24, 2025
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Jul 24, 2025

Cherry-pick of 04f6974 has failed:

On branch mergify/bp/2.29-maintenance/pr-13473
Your branch is up to date with 'origin/2.29-maintenance'.

You are currently cherry-picking commit 04f6974d2.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   .github/actions/install-nix-action/action.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/ci.yml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added merge-queue conflicts automatic backport This PR is a backport produced by automation (does not trigger backporting) labels Jul 24, 2025
xokdvium added 2 commits July 25, 2025 01:14
@xokdvium
ci: Dogfood Nix from master
c17e66a 
(cherry picked from commit 04f6974)

# Conflicts:
#	.github/workflows/ci.yml
@xokdvium
ci: Dogfood nix from master for vm_tests and flake_regressions
a5684b2 
This should provide more coverage for the build from master that
is being dogfooded.

(cherry picked from commit 3b3c021)
@xokdvium xokdvium force-pushed the mergify/bp/2.29-maintenance/pr-13473 branch from de16952 to a5684b2 Compare July 24, 2025 22:45
@xokdvium
ci: Don't dogfood installer from master
bfc5678 
CI on release branches should be stable, otherwise backporting
might become flaky and unreliable. Dogfooding only really makes
sense for CI on master branch, where failures are not as tedious
to work around.
@xokdvium xokdvium merged commit c972f66 into 2.29-maintenance Jul 24, 2025
25 checks passed
@xokdvium xokdvium deleted the mergify/bp/2.29-maintenance/pr-13473 branch July 24, 2025 23:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@edolstra edolstra Awaiting requested review from edolstra edolstra is a code owner

Assignees

No one assigned

Labels

automatic backport This PR is a backport produced by automation (does not trigger backporting)

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@xokdvium