=== Applying patches on top of PostgreSQL commit ID 7d9043aee803bf9bf3307ce5f45f3464ea288cb1 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun Nov 23 13:48:22 UTC 2025
On branch cf/5249
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Allow-CI-to-only-run-the-compiler-warnings-task.patch ===
Applying: Allow CI to only run the compiler warnings task
Using index info to reconstruct a base tree...
M	.cirrus.tasks.yml
M	src/tools/ci/README
Falling back to patching base and 3-way merge...
Auto-merging src/tools/ci/README
Auto-merging .cirrus.tasks.yml
CONFLICT (content): Merge conflict in .cirrus.tasks.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 Allow CI to only run the compiler warnings task
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".
Unstaged changes after reset:
M	.cirrus.tasks.yml
M	src/tools/ci/README
=== using patch(1) to apply patch ./v2-0001-Allow-CI-to-only-run-the-compiler-warnings-task.patch ===
patching file .cirrus.tasks.yml
Hunk #1 FAILED at 72.
Hunk #2 FAILED at 167.
Hunk #3 FAILED at 257.
Hunk #4 FAILED at 274.
Hunk #5 FAILED at 414.
Hunk #6 FAILED at 598.
Hunk #7 FAILED at 704.
Hunk #8 FAILED at 742.
Hunk #9 FAILED at 802.
9 out of 9 hunks FAILED -- saving rejects to file .cirrus.tasks.yml.rej
patching file src/tools/ci/README
Unstaged changes after reset:
M	src/tools/ci/README
Removing .cirrus.tasks.yml.rej
=== using 'git apply' to apply patch ./v2-0001-Allow-CI-to-only-run-the-compiler-warnings-task.patch ===
Applied patch to '.cirrus.tasks.yml' with conflicts.
Applied patch to 'src/tools/ci/README' cleanly.
U .cirrus.tasks.yml
diff --cc .cirrus.tasks.yml
index 2fe9671f3dc,5aac99e2666..00000000000
--- a/.cirrus.tasks.yml
+++ b/.cirrus.tasks.yml
@@@ -97,7 -72,7 +97,11 @@@ task
    # push-wait-for-ci cycle time a bit when debugging operating system specific
    # failures. Uses skip instead of only_if, as cirrus otherwise warns about
    # only_if conditions not matching.
++<<<<<<< ours
 +  skip: $CI_SANITYCHECK_ENABLED == false
++=======
+   skip: $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-task-only:.*'
++>>>>>>> theirs
  
    env:
      CPUS: 4
@@@ -204,7 -167,7 +208,11 @@@ task
    <<: *freebsd_task_template
  
    depends_on: SanityCheck
++<<<<<<< ours
 +  only_if: $CI_FREEBSD_ENABLED
++=======
+   only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-task-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-task-only:[^\n]*freebsd.*'
++>>>>>>> theirs
  
    sysinfo_script: |
      id
@@@ -296,9 -257,7 +304,13 @@@ task
  
    matrix:
      - name: NetBSD - Meson
++<<<<<<< ours
 +      # See REPO_CI_AUTOMATIC_TRIGGER_TASKS in .cirrus.star
 +      trigger_type: $CI_TRIGGER_TYPE_NETBSD
 +      only_if: $CI_NETBSD_ENABLED
++=======
+       only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-task-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-task-only:[^\n]*netbsd.*'
++>>>>>>> theirs
        env:
          OS_NAME: netbsd
          IMAGE_FAMILY: pg-ci-netbsd-postgres
@@@ -321,9 -274,7 +333,13 @@@
        <<: *netbsd_task_template
  
      - name: OpenBSD - Meson
++<<<<<<< ours
 +      # See REPO_CI_AUTOMATIC_TRIGGER_TASKS in .cirrus.star
 +      trigger_type: $CI_TRIGGER_TYPE_OPENBSD
 +      only_if: $CI_OPENBSD_ENABLED
++=======
+       only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-task-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-task-only:[^\n]*openbsd.*'
++>>>>>>> theirs
        env:
          OS_NAME: openbsd
          IMAGE_FAMILY: pg-ci-openbsd-postgres
@@@ -465,7 -414,7 +481,11 @@@ task
    <<: *linux_task_template
  
    depends_on: SanityCheck
++<<<<<<< ours
 +  only_if: $CI_LINUX_ENABLED
++=======
+   only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-task-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-task-only:[^\n]*linux.*'
++>>>>>>> theirs
  
    ccache_cache:
      folder: ${CCACHE_DIR}
@@@ -679,7 -598,7 +699,11 @@@ task
    <<: *macos_task_template
  
    depends_on: SanityCheck
++<<<<<<< ours
 +  only_if: $CI_MACOS_ENABLED
++=======
+   only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-task-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-task-only:[^\n]*(macos|darwin|osx).*'
++>>>>>>> theirs
  
    sysinfo_script: |
      id
@@@ -793,7 -704,7 +817,11 @@@ task
    <<: *windows_task_template
  
    depends_on: SanityCheck
++<<<<<<< ours
 +  only_if: $CI_WINDOWS_ENABLED
++=======
+   only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-task-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-task-only:[^\n]*windows.*'
++>>>>>>> theirs
  
    setup_additional_packages_script: |
      REM choco install -y --no-progress ...
@@@ -826,13 -737,15 +854,24 @@@
  
  task:
    << : *WINDOWS_ENVIRONMENT_BASE
++<<<<<<< ours
 +  name: Windows - Server 2022, MinGW64 - Meson
 +
 +  # See REPO_CI_AUTOMATIC_TRIGGER_TASKS in .cirrus.star.
 +  trigger_type: $CI_TRIGGER_TYPE_MINGW
 +
++=======
+   name: Windows - Server 2019, MinGW64 - Meson
+ 
+   # due to resource constraints we don't run this task by default for now
+   trigger_type: manual
+   # worth using only_if despite being manual, otherwise this task will show up
+   # when e.g. ci-task-only: linux is used.
+   only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-task-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-task-only:[^\n]*mingw.*'
+   # otherwise it'll be sorted before other tasks
++>>>>>>> theirs
    depends_on: SanityCheck
 +  only_if: $CI_MINGW_ENABLED
  
    env:
      TEST_JOBS: 4 # higher concurrency causes occasional failures
@@@ -890,9 -799,10 +929,13 @@@ task
  
    # To limit unnecessary work only run this once the SanityCheck
    # succeeds. This is particularly important for this task as we intentionally
 -  # use always: to continue after failures. Task that did not run count as a
 -  # success, so we need to recheck SanityChecks's condition here ...
 +  # use always: to continue after failures.
    depends_on: SanityCheck
++<<<<<<< ours
 +  only_if: $CI_COMPILERWARNINGS_ENABLED
++=======
+   only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-task-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-task-only:[^\n]*compilerwarnings.*'
++>>>>>>> theirs
  
    env:
      CPUS: 4