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

Bump fetcher cache version (backport #11915) #11932

Merged
merged 1 commit into from
Nov 23, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 21, 2024

We're getting more reports in

It appears that something hasn't gone right process-wise. I find this mistake not to be worth investigating, but rather something to pay attention to going forward.

Let's nip this in the bud.

Closes #10985

Priorities and Process

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

Copy link
Author

mergify bot commented Nov 21, 2024

Cherry-pick of e948c8e has failed:

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

You are currently cherry-picking commit e948c8e03.
  (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:   src/libfetchers/cache.cc

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

@mergify mergify bot requested a review from edolstra as a code owner November 21, 2024 15:35
@github-actions github-actions bot added the fetching Networking with the outside (non-Nix) world, input locking label Nov 21, 2024
src/libfetchers/cache.cc Outdated Show resolved Hide resolved
src/libfetchers/cache.cc Outdated Show resolved Hide resolved
src/libfetchers/cache.cc Outdated Show resolved Hide resolved
src/libfetchers/cache.cc Outdated Show resolved Hide resolved
We're getting more reports in #10985

It appears that something hasn't gone right process-wise.
I find this mistake not to be worth investigating, but rather something
to pay attention to going forward.

Let's nip this in the bud.

Closes #10985

(cherry picked from commit e948c8e)

Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
@Mic92 Mic92 force-pushed the mergify/bp/2.24-maintenance/pr-11915 branch from c85e026 to bf67741 Compare November 23, 2024 08:06
@Mic92 Mic92 enabled auto-merge November 23, 2024 08:06
@Mic92 Mic92 merged commit fc11659 into 2.24-maintenance Nov 23, 2024
22 of 24 checks passed
@Mic92 Mic92 deleted the mergify/bp/2.24-maintenance/pr-11915 branch November 23, 2024 08:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts fetching Networking with the outside (non-Nix) world, input locking merge-queue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants