=== Applying patches on top of PostgreSQL commit ID 72498a86989e3491228ba09be43eab778a3ac943 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Fri Jun 5 13:30:29 UTC 2026 On branch cf/6430 nothing to commit, working tree clean === using 'git am' to apply patch ./v1-0001-ci-Add-MTEST_SUITES-for-optional-test-tailoring.patch === Applying: ci: Add MTEST_SUITES for optional test tailoring Using index info to reconstruct a base tree... A .cirrus.tasks.yml Falling back to patching base and 3-way merge... CONFLICT (modify/delete): .cirrus.tasks.yml deleted in HEAD and modified in ci: Add MTEST_SUITES for optional test tailoring. Version ci: Add MTEST_SUITES for optional test tailoring of .cirrus.tasks.yml left in tree. error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 ci: Add MTEST_SUITES for optional test tailoring When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". === using patch(1) to apply patch ./v1-0001-ci-Add-MTEST_SUITES-for-optional-test-tailoring.patch === can't find file to patch at input line 16 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |From af8bd8487af4e878408606b701070d0feec6c1a6 Mon Sep 17 00:00:00 2001 |From: Jacob Champion |Date: Tue, 2 Sep 2025 15:37:53 -0700 |Subject: [PATCH v1] ci: Add MTEST_SUITES for optional test tailoring | |Should make it easier to control the test cycle time for Cirrus. Add the |desired suites (remembering `--suite setup`!) to the top-level envvar. |--- | .cirrus.tasks.yml | 15 ++++++++------- | 1 file changed, 8 insertions(+), 7 deletions(-) | |diff --git a/.cirrus.tasks.yml b/.cirrus.tasks.yml |index 77d0362a551..fe0d8f806a7 100644 |--- a/.cirrus.tasks.yml |+++ b/.cirrus.tasks.yml -------------------------- No file to patch. Skipping patch. 8 out of 8 hunks ignored === using 'git apply' to apply patch ./v1-0001-ci-Add-MTEST_SUITES-for-optional-test-tailoring.patch === error: .cirrus.tasks.yml: does not exist in index