Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 30, 2025

Motivation

Waiting for the minio unit is apparently not reliable enough (see for example https://github.com/DeterminateSystems/nix-src/actions/runs/15220608881/job/42815546769), so let's also wait for the port.

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

Waiting for the minio unit is apparently not reliable enough, so let's
also wait for the port.

(cherry picked from commit ca96967)

# Conflicts:
#	tests/nixos/s3-binary-cache-store.nix
@mergify mergify bot added automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts merge-queue labels Jul 30, 2025
@mergify mergify bot requested a review from edolstra as a code owner July 30, 2025 12:13
Copy link
Contributor Author

mergify bot commented Jul 30, 2025

Cherry-pick of ca96967 has failed:

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

You are currently cherry-picking commit ca9696748.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tests/nixos/s3-binary-cache-store.nix

no changes added to commit (use "git add" and/or "git commit -a")

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

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