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

tests: Wait for network *online* targets and/or multi-user targets (more) (backport #12315) #12318

Merged
merged 1 commit into from
Jan 20, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 20, 2025

Motivation

More prevalent than I thought in #12302

See also https://github.com/NixOS/nix/actions/runs/12872412321/job/35887830320?pr=12310 which is a failed github-flakes test without "Network is Online"

Context


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 #12315 done by [Mergify](https://mergify.com).

More prevalent than I thought in 15073e8

See also https://github.com/NixOS/nix/actions/runs/12872412321/job/35887830320?pr=12310
which is a failed github-flakes test without "Network is Online"

(cherry picked from commit 6f0bdd9)

# Conflicts:
#	tests/nixos/nix-docker.nix
@mergify mergify bot added automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts merge-queue labels Jan 20, 2025
@mergify mergify bot requested a review from edolstra as a code owner January 20, 2025 18:16
Copy link
Contributor Author

mergify bot commented Jan 20, 2025

Cherry-pick of 6f0bdd9 has failed:

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

You are currently cherry-picking commit 6f0bdd9ae.
  (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:
	modified:   tests/nixos/git-submodules.nix
	modified:   tests/nixos/github-flakes.nix
	modified:   tests/nixos/nss-preload.nix
	modified:   tests/nixos/s3-binary-cache-store.nix
	modified:   tests/nixos/sourcehut-flakes.nix

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   tests/nixos/nix-docker.nix

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 merged commit f366bea into 2.24-maintenance Jan 20, 2025
27 checks passed
@mergify mergify bot deleted the mergify/bp/2.24-maintenance/pr-12315 branch January 20, 2025 18:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts merge-queue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant