=== Applying patches on top of PostgreSQL commit ID 40af897eb777bc8a6afca14195587e79e57a5c06 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Feb 21 02:03:24 UTC 2025
On branch cf/5360
nothing to commit, working tree clean
=== applying patch ./v3-0001-Fix-meson-could-not-find-bsd_auth.h.patch
Applied patch to 'meson.build' cleanly.
[cf/5360 bfc1445897] Fix meson could not find bsd_auth.h
 Author: Nazir Bilal Yavuz <byavuz81@gmail.com>
 Date: Thu Nov 7 15:48:31 2024 +0300
=== applying patch ./v3-0002-Add-NetBSD-and-OpenBSD-tasks-to-the-Postgres-CI.patch
Applied patch to '.cirrus.tasks.yml' with conflicts.
Applied patch to '.cirrus.yml' cleanly.
Applied patch to 'src/tools/ci/README' with conflicts.
U .cirrus.tasks.yml
U src/tools/ci/README
diff --cc .cirrus.tasks.yml
index 91b51142d2,43cca1aeb5..0000000000
--- a/.cirrus.tasks.yml
+++ b/.cirrus.tasks.yml
@@@ -219,7 -215,7 +219,11 @@@ task
  
  task:
    depends_on: SanityCheck
++<<<<<<< ours
 +  trigger_type: manual
++=======
+   # trigger_type: manual
++>>>>>>> theirs
  
    env:
      # Below are experimentally derived to be a decent choice.
@@@ -227,28 -223,25 +231,45 @@@
      BUILD_JOBS: 8
      TEST_JOBS: 8
  
++<<<<<<< ours
 +    # Default working directory is /tmp, but its total size (1.2 GB) is not
++=======
+     # Default working directory is /tmp but its total size (1.2 GB) is not
++>>>>>>> theirs
      # enough, so different working and cache directory are set.
      CIRRUS_WORKING_DIR: /home/postgres/postgres
      CCACHE_DIR: /home/postgres/cache
  
      PATH: /usr/sbin:$PATH
++<<<<<<< ours
 +    CORE_DUMP_DIR: /var/crash
++=======
++>>>>>>> theirs
  
    matrix:
      - name: NetBSD - Meson
        only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-os-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-os-only:[^\n]*netbsd.*'
        env:
++<<<<<<< ours
 +        OS_NAME: netbsd
++=======
++>>>>>>> theirs
          IMAGE_FAMILY: pg-ci-netbsd-postgres
          PKGCONFIG_PATH: '/usr/lib/pkgconfig:/usr/pkg/lib/pkgconfig'
          # initdb fails with: 'invalid locale settings' error on NetBSD.
          # Force 'LANG' and 'LC_*' variables to be 'C'.
++<<<<<<< ours
 +        # See https://postgr.es/m/2490325.1734471752%40sss.pgh.pa.us
 +        LANG: "C"
 +        LC_ALL: "C"
 +        # -Duuid is not set for the NetBSD, see the comment below, above
 +        # configure_script, for more information.
++=======
+         LANG: "C"
+         LC_ALL: "C"
+         # -Duuid is not set for the NetBSD, see the comment at the configure
+         # script for more information.
++>>>>>>> theirs
        setup_additional_packages_script: |
          #pkgin -y install ...
        <<: *netbsd_task_template
@@@ -256,15 -249,12 +277,21 @@@
      - name: OpenBSD - Meson
        only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-os-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-os-only:[^\n]*openbsd.*'
        env:
++<<<<<<< ours
 +        OS_NAME: openbsd
++=======
++>>>>>>> theirs
          IMAGE_FAMILY: pg-ci-openbsd-postgres
          PKGCONFIG_PATH: '/usr/lib/pkgconfig:/usr/local/lib/pkgconfig'
          UUID: -Duuid=e2fs
          TCL: -Dtcl_version=tcl86
        setup_additional_packages_script: |
          #pkg_add -I ...
++<<<<<<< ours
 +      # Always core dump to ${CORE_DUMP_DIR}
 +      set_core_dump_script: sysctl -w kern.nosuidcoredump=2
++=======
++>>>>>>> theirs
        <<: *openbsd_task_template
  
    sysinfo_script: |
@@@ -282,10 -272,6 +309,13 @@@
      chown -R postgres:users /home/postgres
      mkdir -p ${CCACHE_DIR}
      chown -R postgres:users ${CCACHE_DIR}
++<<<<<<< ours
 +  setup_core_files_script: |
 +    mkdir -p ${CORE_DUMP_DIR}
 +    chmod -R 770 ${CORE_DUMP_DIR}
 +    chown -R postgres:users ${CORE_DUMP_DIR}
++=======
++>>>>>>> theirs
  
    # -Duuid=bsd is not set since 'bsd' uuid option
    # is not working on NetBSD & OpenBSD. See
@@@ -308,20 -294,13 +338,27 @@@
    test_world_script: |
      su postgres <<-EOF
        ulimit -c unlimited
++<<<<<<< ours
 +      # Otherwise tests will fail on OpenBSD, due to inability to start enough
 +      # processes.
++=======
+       # Otherwise tests will fail on OpenBSD, due to the lack of enough processes.
++>>>>>>> theirs
        ulimit -p 256
        meson test $MTEST_ARGS --num-processes ${TEST_JOBS}
      EOF
  
    on_failure:
      <<: *on_failure_meson
++<<<<<<< ours
 +    cores_script: |
 +      # Although we try to configure the OS to core dump inside
 +      # ${CORE_DUMP_DIR}, they may not obey this. So, move core files to the
 +      # ${CORE_DUMP_DIR} directory.
 +      find build/ -type f -name '*.core' -exec mv '{}' ${CORE_DUMP_DIR} \;
 +      src/tools/ci/cores_backtrace.sh ${OS_NAME} ${CORE_DUMP_DIR}
++=======
++>>>>>>> theirs
  
  
  # configure feature flags, shared between the task running the linux tests and
diff --cc src/tools/ci/README
index 12c1e7c308,dd703272d3..0000000000
--- a/src/tools/ci/README
+++ b/src/tools/ci/README
@@@ -61,7 -61,7 +61,11 @@@ 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-os-only: {(freebsd|netbsd|openbsd|linux|macos|windows|mingw)}
++>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> theirs
  
    Only runs CI on operating systems specified. This can be useful when
    addressing portability issues affecting only a subset of platforms.