=== Applying patches on top of PostgreSQL commit ID 1fd1bd871012732e3c6c482667d2f2c56f1a9395 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Feb 20 13:04:23 UTC 2025
On branch cf/5249
nothing to commit, working tree clean
=== applying patch ./v1-0001-Allow-CI-to-only-run-the-compiler-warnings-task.patch
Applied patch to '.cirrus.tasks.yml' cleanly.
Applied patch to 'src/tools/ci/README' with conflicts.
U src/tools/ci/README
diff --cc src/tools/ci/README
index 12c1e7c308,da4125defa..0000000000
--- a/src/tools/ci/README
+++ b/src/tools/ci/README
@@@ -61,10 -61,11 +61,15 @@@ Controlling CI via commit message
  The behavior of CI can be controlled by special content in commit
  messages. Currently the following controls are available:
  
++<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ours
 +- ci-os-only: {(freebsd|linux|macos|mingw|netbsd|openbsd|windows)}
++================================
+ - ci-task-only: {(freebsd|linux|macos|windows|mingw|compilerwarnings)}
++>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> theirs
  
-   Only runs CI on operating systems specified. This can be useful when
-   addressing portability issues affecting only a subset of platforms.
+   Only runs CI compiler warnings or on operating systems specified. This can be
+   useful when addressing portability issues affecting only a subset of platforms
+   or when addressing compiler warnings issues.
  
  
  Using custom compute resources for CI