v2.1.pe-0001-Fixups.patch
text/plain
Filename: v2.1.pe-0001-Fixups.patch
Type: text/plain
Part: 0
From c1bab3b0809899a0b8fb61cdb398947c8f169a28 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter@eisentraut.org>
Date: Thu, 28 May 2026 13:20:50 +0200
Subject: [PATCH v2.1.pe] Fixups
- Shorten job names to avoid truncation in UI
- Tweak CompilerWarnings step names
- macOS:
- Add some HOMEBREW_* environment variables to disable unnecessary
steps and output
- Typo cpanm -> cpan
- Install readline tcl-tk@8 zlib for consistency with previous setup
- Disable sysroot
- Use the intended Python version
- Windows VS:
- Install winflexbison3, not winflexbison (old)
- Windows minGW:
- Reduce set of installed packages
---
.github/workflows/ci.yml | 49 +++++++++++++++++++++-------------------
1 file changed, 26 insertions(+), 23 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6d20068727c..21c4106e603 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -285,7 +285,7 @@ jobs:
# print_stacktraces=1,verbosity=2, duh
# detect_leaks=0: too many uninteresting leak errors in short-lived binaries
linux-autoconf:
- name: Linux - Debian Trixie - Autoconf
+ name: Linux - Debian - Autoconf
needs: [setup, sanity-check]
if: |
!cancelled() &&
@@ -410,7 +410,7 @@ jobs:
# - Uses io_method=io_uring
# - Uses meson feature autodetection
linux-meson:
- name: Linux - Debian Trixie - Meson
+ name: Linux - Debian - Meson
needs: [setup, sanity-check]
if: |
!cancelled() &&
@@ -570,7 +570,7 @@ jobs:
# - Specifies configuration options that test reading/writing/copying of node trees
# - Specifies debug_parallel_query=regress, to catch related issues during CI
macos:
- name: macOS - Sequoia - Meson
+ name: macOS - Meson
needs: [setup, sanity-check]
if: |
!cancelled() &&
@@ -585,6 +585,12 @@ jobs:
# Fix: Needs to be re-tested for Github Actions.
TEST_JOBS: 8
+ HOMEBREW_NO_AUTO_UPDATE: 1
+ HOMEBREW_DISPLAY_INSTALL_TIMES: 1
+ HOMEBREW_NO_INSTALL_CLEANUP: 1
+ HOMEBREW_NO_INSTALL_UPGRADE: 1
+ HOMEBREW_NO_UPDATE_REPORT_NEW: 1
+
CCACHE_DIR: ${{ github.workspace }}/ccache_dir
MESON_FEATURES: >-
@@ -642,16 +648,15 @@ jobs:
run: |
brew update
brew install \
- ccache meson openldap python@3.12 tcl-tk
- # IPC::Run via cpanm (system perl)
+ ccache meson openldap python@3.12 readline tcl-tk@8 zlib
+ # IPC::Run via cpan (system perl)
sudo cpan -T -i IPC::Run IO::Tty
- name: Configure
run: |
# These formulae are keg-only (not symlinked into $(brew --prefix)),
# so pkg-config wouldn't find them via the default search path.
- # lz4, zstd and other non-keg-only deps are picked up automatically.
- for f in openssl@3 icu4c krb5 openldap; do
+ for f in openssl@3 icu4c krb5 openldap readline tcl-tk@8 zlib; do
PKG_CONFIG_PATH="$(brew --prefix $f)/lib/pkgconfig:${PKG_CONFIG_PATH}"
done
export PKG_CONFIG_PATH
@@ -667,6 +672,8 @@ jobs:
--buildtype=debug \
-Dextra_include_dirs="${extra_inc}" \
-Dextra_lib_dirs="${extra_lib}" \
+ -Ddarwin_sysroot=none \
+ -DPYTHON=python3.12 \
${MESON_COMMON_FEATURES} \
${MESON_FEATURES} \
build
@@ -698,7 +705,7 @@ jobs:
windows-vs:
- name: Windows - Server 2022, VS 2022 - Meson & ninja
+ name: Windows - VS - Meson & ninja
needs: [setup, sanity-check]
if: |
!cancelled() &&
@@ -791,7 +798,7 @@ jobs:
- name: Install dependencies
shell: pwsh
run: |
- choco install -y --no-progress --limitoutput diffutils winflexbison
+ choco install -y --no-progress --limitoutput diffutils winflexbison3
# meson + ninja aren't preinstalled on windows-2022. Install via pip
python -m pip install --upgrade meson ninja
@@ -826,7 +833,7 @@ jobs:
Add-Content c:\Windows\System32\Drivers\etc\hosts "127.0.0.2 pg-loadbalancetest"
Add-Content c:\Windows\System32\Drivers\etc\hosts "127.0.0.3 pg-loadbalancetest"
- - name: Setup sock dir
+ - name: Setup socket directory
shell: cmd
run: mkdir %PG_REGRESS_SOCK_DIR%
@@ -861,7 +868,7 @@ jobs:
windows-mingw:
- name: Windows - Server 2022, MinGW64 - Meson
+ name: Windows - MinGW - Meson
needs: [setup, sanity-check]
if: |
!cancelled() &&
@@ -912,7 +919,6 @@ jobs:
install: >-
git bison flex make diffutils
mingw-w64-ucrt-x86_64-ccache
- mingw-w64-ucrt-x86_64-docbook-xml
mingw-w64-ucrt-x86_64-gcc
mingw-w64-ucrt-x86_64-icu
mingw-w64-ucrt-x86_64-libbacktrace
@@ -923,13 +929,10 @@ jobs:
mingw-w64-ucrt-x86_64-meson
mingw-w64-ucrt-x86_64-perl
mingw-w64-ucrt-x86_64-pkg-config
- mingw-w64-ucrt-x86_64-python-cryptography
- mingw-w64-ucrt-x86_64-python-pip
- mingw-w64-ucrt-x86_64-python-pytest
mingw-w64-ucrt-x86_64-readline
mingw-w64-ucrt-x86_64-zlib
- - name: Install IPC::Run for tap tests
+ - name: Install additional dependencies
shell: msys2 {0}
run: |
# Pin IPC::Run to NJM/IPC-Run-20250809.0; TODDR/IPC-Run-20260322.0
@@ -938,7 +941,7 @@ jobs:
(echo; echo o conf recommends_policy 0; echo notest install NJM/IPC-Run-20250809.0.tar.gz) | cpan
perl -mIPC::Run -e 1
- - name: Setup sock dir
+ - name: Setup socket directory
shell: cmd
run: mkdir %PG_REGRESS_SOCK_DIR%
@@ -1034,7 +1037,7 @@ jobs:
mkdir -p "$CCACHE_DIR"
# gcc, cassert off, dtrace on
- - name: gcc warning + (dtrace)
+ - name: gcc warnings + (dtrace)
if: always()
run: |
./configure \
@@ -1046,7 +1049,7 @@ jobs:
make -s -j${BUILD_JOBS} world-bin
# gcc, cassert on, dtrace off
- - name: gcc warning + (cassert)
+ - name: gcc warnings + (cassert)
if: always()
run: |
./configure \
@@ -1058,7 +1061,7 @@ jobs:
make -s -j${BUILD_JOBS} world-bin
# clang, cassert off, dtrace off
- - name: clang warning
+ - name: clang warnings
if: always()
run: |
./configure \
@@ -1069,7 +1072,7 @@ jobs:
make -s -j${BUILD_JOBS} world-bin
# clang, cassert on, dtrace on
- - name: clang warning + (cassert + dtrace)
+ - name: clang warnings + (cassert + dtrace)
if: always()
run: |
./configure \
@@ -1081,7 +1084,7 @@ jobs:
make -s -j${BUILD_JOBS} clean
make -s -j${BUILD_JOBS} world-bin
- - name: mingw cross compile
+ - name: mingw warnings (cross compilation)
if: always()
run: |
./configure \
@@ -1097,7 +1100,7 @@ jobs:
# Verify docs can be built
###
# XXX: Only do this if there have been changes in doc/ since last build
- - name: Docs build
+ - name: Build documentation
if: always()
run: |
./configure \
--
2.54.0