=== Applying patches on top of PostgreSQL commit ID 1200dfd60c367e97a5e1f31100d82072eb0178b6 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Aug  6 02:18:30 UTC 2026
On branch cf/6658
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v3-0001-ci-Don-t-collect-successful-tests-logs.patch ===
Applying: ci: Don't collect successful tests' logs
Using index info to reconstruct a base tree...
M	.github/workflows/pg-ci.yml
M	meson.build
Falling back to patching base and 3-way merge...
Auto-merging meson.build
Auto-merging .github/workflows/pg-ci.yml
CONFLICT (content): Merge conflict in .github/workflows/pg-ci.yml
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: Don't collect successful tests' logs
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 ./v3-0001-ci-Don-t-collect-successful-tests-logs.patch ===
patching file .github/workflows/pg-ci.yml
Hunk #1 succeeded at 407 (offset 45 lines).
Hunk #2 succeeded at 622 (offset 49 lines).
Hunk #3 succeeded at 681 (offset 51 lines).
Hunk #4 succeeded at 836 (offset 54 lines).
Hunk #5 FAILED at 979.
Hunk #6 FAILED at 1096.
2 out of 6 hunks FAILED -- saving rejects to file .github/workflows/pg-ci.yml.rej
patching file meson.build
Hunk #1 succeeded at 4124 (offset -9 lines).
patching file src/tools/ci/ci_meson_clear_testrun_folder
Unstaged changes after reset:
M	.github/workflows/pg-ci.yml
M	meson.build
Removing .github/workflows/pg-ci.yml.rej
Removing src/tools/ci/ci_meson_clear_testrun_folder
=== using 'git apply' to apply patch ./v3-0001-ci-Don-t-collect-successful-tests-logs.patch ===
Applied patch to '.github/workflows/pg-ci.yml' with conflicts.
Applied patch to 'meson.build' cleanly.
Falling back to direct application...
U .github/workflows/pg-ci.yml
diff --cc .github/workflows/pg-ci.yml
index a2629c8335a,ad9e79171d6..00000000000
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@@ -1024,6 -979,11 +1038,14 @@@ jobs
              call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
          run: *meson_test_world_cmd
  
++<<<<<<< ours
++=======
+       - *clear_test_folder_step
+ 
+       # TODO: We need to collect crashlogs but for them to be generated, we'd
+       # have to configure the JIT Debugger to do so. cdb.exe is installed on
+       # the runner so that is possible.
++>>>>>>> theirs
        - *upload_logs_step
  
  
@@@ -1142,6 -1098,11 +1164,14 @@@
        - name: Test world
          run: *meson_test_world_cmd
  
++<<<<<<< ours
++=======
+       - *clear_test_folder_step
+ 
+       # TODO: We want to include crashlogs, but they are not yet
+       # collected. cdb.exe is installed on the runner, so we can configure it
+       # appropriately.
++>>>>>>> theirs
        - *upload_logs_step