On 29.05.26 11:51, Nazir Bilal Yavuz wrote:
v4 is attached, GA run:
https://github.com/nbyavuz/postgres/actions/runs/26628396798
This looks fine to me.
Attached are a few more small tweaks.
If you produce another patch, maybe you could expand the commit message
and add all the credits, the help the eventual committer.
(Also note that there is a freeze on the master branch until the beta is
tagged, so this likely wouldn't be committable until late Monday or
Tuesday, so there is still some time to discuss and fine-tune.)
From efa757f5b385ceebf4ac1c798f1a44dd5f1fe2de Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <[email protected]>
Date: Sat, 30 May 2026 16:50:01 +0200
Subject: [PATCH v4.1.pe 1/3] Shell simplification
---
.github/workflows/postgresql-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/postgresql-ci.yml
b/.github/workflows/postgresql-ci.yml
index b56305f9847..85eaa72688c 100644
--- a/.github/workflows/postgresql-ci.yml
+++ b/.github/workflows/postgresql-ci.yml
@@ -119,9 +119,9 @@ jobs:
shell: bash
run: |
set -e
- all_os="${CI_OS_ONLY_JOBS}"
+ all_os=${CI_OS_ONLY_JOBS}
if printf '%s\n' "$MSG" | grep -qE '^ci-os-only: '; then
- sel=$(printf '%s\n' "$MSG" | grep -E '^ci-os-only: ' | head -1 |
sed 's/^ci-os-only: //')
+ sel=$(printf '%s\n' "$MSG" | sed -n 's/^ci-os-only: //p' | head -n
1)
echo "ci-os-only selection: $sel"
else
sel="$all_os"
--
2.54.0
From 4ad17a5c5ade261654da4f5e80b7829bdf0f3a39 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <[email protected]>
Date: Sat, 30 May 2026 16:50:28 +0200
Subject: [PATCH v4.1.pe 2/3] Use MINGW_PACKAGE_PREFIX
---
.github/workflows/postgresql-ci.yml | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/postgresql-ci.yml
b/.github/workflows/postgresql-ci.yml
index 85eaa72688c..685b526ae9f 100644
--- a/.github/workflows/postgresql-ci.yml
+++ b/.github/workflows/postgresql-ci.yml
@@ -818,19 +818,19 @@ jobs:
run: |
pacman -S --noconfirm --needed \
git bison flex make diffutils \
- mingw-w64-ucrt-x86_64-ccache \
- mingw-w64-ucrt-x86_64-gcc \
- mingw-w64-ucrt-x86_64-icu \
- mingw-w64-ucrt-x86_64-libbacktrace \
- mingw-w64-ucrt-x86_64-libxml2 \
- mingw-w64-ucrt-x86_64-libxslt \
- mingw-w64-ucrt-x86_64-lz4 \
- mingw-w64-ucrt-x86_64-make \
- mingw-w64-ucrt-x86_64-meson \
- mingw-w64-ucrt-x86_64-perl \
- mingw-w64-ucrt-x86_64-pkg-config \
- mingw-w64-ucrt-x86_64-readline \
- mingw-w64-ucrt-x86_64-zlib
+ ${MINGW_PACKAGE_PREFIX}-ccache \
+ ${MINGW_PACKAGE_PREFIX}-gcc \
+ ${MINGW_PACKAGE_PREFIX}-icu \
+ ${MINGW_PACKAGE_PREFIX}-libbacktrace \
+ ${MINGW_PACKAGE_PREFIX}-libxml2 \
+ ${MINGW_PACKAGE_PREFIX}-libxslt \
+ ${MINGW_PACKAGE_PREFIX}-lz4 \
+ ${MINGW_PACKAGE_PREFIX}-make \
+ ${MINGW_PACKAGE_PREFIX}-meson \
+ ${MINGW_PACKAGE_PREFIX}-perl \
+ ${MINGW_PACKAGE_PREFIX}-pkg-config \
+ ${MINGW_PACKAGE_PREFIX}-readline \
+ ${MINGW_PACKAGE_PREFIX}-zlib
- name: Install additional dependencies
run: |
--
2.54.0
From 2b57c673134b486dd3d4e81b5454ff5773a7d4f3 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <[email protected]>
Date: Sat, 30 May 2026 16:50:44 +0200
Subject: [PATCH v4.1.pe 3/3] Spelling nitpicks
---
.github/workflows/postgresql-ci.yml | 24 ++++++++++++------------
src/tools/ci/ci_macports_packages.sh | 2 +-
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/postgresql-ci.yml
b/.github/workflows/postgresql-ci.yml
index 685b526ae9f..7392f669ee2 100644
--- a/.github/workflows/postgresql-ci.yml
+++ b/.github/workflows/postgresql-ci.yml
@@ -1,6 +1,6 @@
# GitHub Actions CI configuration for PostgreSQL
-name: Github Actions CI
+name: GitHub Actions CI
on:
push:
@@ -245,12 +245,12 @@ jobs:
# - Uses PG_TEST_PG_COMBINEBACKUP_MODE=--copy-file-range
#
# Meson:
- # - Test both 64 and 32 bit builds
+ # - Test both 64- and 32-bit builds
# - Uses undefined behaviour and alignment sanitizers, (sanitizer failures
# are typically printed in the server log)
# - Uses io_method=io_uring
# - Uses meson feature autodetection
- # - 32 bit build tests with LANG=C to give ICU some buildfarm-uncovered
+ # - 32-bit build tests with LANG=C to give ICU some buildfarm-uncovered
# coverage. Also, newer Python insists on changing LC_CTYPE away from C,
# prevent that with PYTHONCOERCECLOCALE.
#
@@ -294,7 +294,7 @@ jobs:
**/*.diffs
**/regress_log_*
- - name: Meson (64bit)
+ - name: Meson (64-bit)
slug: meson-64
cc: ccache gcc
cxx: ccache g++
@@ -314,7 +314,7 @@ jobs:
meson test ${MTEST_ARGS} -C build --num-processes ${TEST_JOBS}
logs_paths: *log_paths
- - name: Meson (32bit)
+ - name: Meson (32-bit)
slug: meson-32
cc: ccache gcc -m32
cxx: ccache g++ -m32
@@ -452,7 +452,7 @@ jobs:
BUILD_JOBS: 4
# Test performance regresses noticeably when using all cores. 8 works OK.
#
https://postgr.es/m/20220927040208.l3shfcidovpzqxfh%40awork3.anarazel.de
- # Fix: Needs to be re-tested for Github Actions.
+ # Fix: Needs to be re-tested for GitHub Actions.
TEST_JOBS: 8
CCACHE_DIR: ${{ github.workspace }}/ccache_dir
@@ -536,20 +536,20 @@ jobs:
key: ${{ steps.mpkey.outputs.key }}
restore-keys: ${{ steps.mpkey.outputs.restore-key }}
- # Use macports, even though homebrew is installed. The installation
+ # Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
- # homebrew, even if we cache the downloads. We can't cache all of
- # homebrew, because it's already large. So we use macports. To cache
+ # Homebrew, even if we cache the downloads. We can't cache all of
+ # Homebrew, because it's already large. So we use MacPorts. To cache
# the installation we create a .dmg file that we mount if it already
# exists.
# XXX: The reason for the direct p5.34* references is that we'd need
- # the large macport tree around to figure out that p5-io-tty is
+ # the large MacPort tree around to figure out that p5-io-tty is
# actually p5.34-io-tty. Using the unversioned name works, but
- # updates macports every time.
+ # updates MacPorts every time.
- name: Install dependencies (MacPorts)
env:
# Pass token so the script's GitHub API call to list MacPorts
- # releases isn't subject to the 60/hr/IP unauthenticated rate
+ # releases isn't subject to the 60/h/IP unauthenticated rate
# limit (shared across all jobs on the runner's IP).
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
diff --git a/src/tools/ci/ci_macports_packages.sh
b/src/tools/ci/ci_macports_packages.sh
index 4c79f90fed0..18a06f96119 100755
--- a/src/tools/ci/ci_macports_packages.sh
+++ b/src/tools/ci/ci_macports_packages.sh
@@ -21,7 +21,7 @@ echo "macOS major version: $macos_major_version"
macports_release_list_url="https://api.github.com/repos/macports/macports-base/releases";
macports_version_pattern="2\.10\.1"
# Authenticate the GitHub API request when a token is available (e.g. on
-# GitHub Actions). Unauthenticated requests share a 60/hr/IP rate limit
+# GitHub Actions). Unauthenticated requests share a 60/h/IP rate limit
# with every other job on the runner's IP and frequently return an error
# JSON, leaving $macports_url empty and breaking the subsequent curl.
auth_header=""
--
2.54.0
