Re: Explicitly enable meson features in CI

[Jacob Champion]

On Mon, Jul 28, 2025 at 11:20 AM Jacob Champion
<jacob.champ...@enterprisedb.com> wrote:
> Sounds good. I will take another look at this with a committer hat and
> push Sometime Soon.

Getting back to this -- for v7 I've rebased over the FASTLINK commit.
I've squashed 0002 and 0003 together, too -- I think it's easier to
see the new envvar hierarchy in one commit.

I also moved the `-Dnls=disabled` setting into a mingw-specific
MESON_FEATURES variable. I think the existing comment in v6 wasn't
really in a place to prevent a developer from adding it to
MESON_COMMON_FEATURES in the future, which would have regressed
967db242c. There shouldn't be a hazard now.

--Jacob

diff --git a/.cirrus.tasks.yml b/.cirrus.tasks.yml
index b8415f6fee5..94999e64f5f 100644
--- a/.cirrus.tasks.yml
+++ b/.cirrus.tasks.yml
@@ -789,7 +789,7 @@ task:
   # Use /DEBUG:FASTLINK to avoid high memory usage during linking
   configure_script: |
     vcvarsall x64
-    meson setup --backend ninja %MESON_COMMON_PG_CONFIG_ARGS% --buildtype 
debug -Dc_link_args=/DEBUG:FASTLINK -Db_pch=true 
-Dextra_lib_dirs=c:\openssl\1.1\lib -Dextra_include_dirs=c:\openssl\1.1\include 
-DTAR=%TAR% %MESON_FEATURES% build
+    meson setup --backend ninja %MESON_COMMON_PG_CONFIG_ARGS% --buildtype 
debug -Db_pch=true -Dextra_lib_dirs=c:\openssl\1.1\lib 
-Dextra_include_dirs=c:\openssl\1.1\include -DTAR=%TAR% %MESON_FEATURES% build
 
   build_script: |
     vcvarsall x64
@@ -833,6 +833,11 @@ task:
     CHERE_INVOKING: 1
     BASH: C:\msys64\usr\bin\bash.exe -l
 
+    # Keep -Dnls explicitly disabled, as the number of files it creates causes 
a
+    # noticeable slowdown.
+    MESON_FEATURES: >-
+      -Dnls=disabled
+
   <<: *windows_task_template
 
   ccache_cache:
@@ -847,9 +852,8 @@ task:
     %BASH% -c "where perl"
     %BASH% -c "perl --version"
 
-  # -Dnls need to be disabled as the number of files it creates cause a 
noticable slowdown
   configure_script: |
-    %BASH% -c "meson setup %MESON_COMMON_PG_CONFIG_ARGS%  -Ddebug=true 
-Doptimization=g -Db_pch=true %MESON_COMMON_FEATURES% -DTAR=%TAR% build"
+    %BASH% -c "meson setup %MESON_COMMON_PG_CONFIG_ARGS% -Ddebug=true 
-Doptimization=g -Db_pch=true %MESON_COMMON_FEATURES% %MESON_FEATURES% 
-DTAR=%TAR% build"
 
   build_script: |
     %BASH% -c "ninja -C build ${MBUILD_TARGET}"

v7-0001-ci-Remove-extra-PG_TEST_EXTRA-from-NetBSD-OpenBSD.patch
Description: Binary data

v7-0002-ci-Explicitly-enable-Meson-features.patch
Description: Binary data