Skip to content

Commit 67cb25d

Browse files
authored
Merge pull request IvorySQL#734 from bigplaice/4_stable_sync_with_pg_17.3
4 stable sync with pg 17.3
2 parents 24be9c9 + f3e6685 commit 67cb25d

File tree

423 files changed

+45665
-31784
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

423 files changed

+45665
-31784
lines changed

.cirrus.tasks.yml

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ env:
1717
CHECK: check-world PROVE_FLAGS=$PROVE_FLAGS
1818
CHECKFLAGS: -Otarget
1919
PROVE_FLAGS: --timer
20+
# Build test dependencies as part of the build step, to see compiler
21+
# errors/warnings in one place.
22+
MBUILD_TARGET: all testprep
2023
MTEST_ARGS: --print-errorlogs --no-rebuild -C build
2124
PGCTLTIMEOUT: 120 # avoids spurious failures during parallel tests
2225
TEMP_CONFIG: ${CIRRUS_WORKING_DIR}/src/tools/ci/pg_ci_base.conf
@@ -99,7 +102,7 @@ task:
99102
EOF
100103
build_script: |
101104
su postgres <<-EOF
102-
ninja -C build -j${BUILD_JOBS}
105+
ninja -C build -j${BUILD_JOBS} ${MBUILD_TARGET}
103106
EOF
104107
upload_caches: ccache
105108

@@ -178,7 +181,7 @@ task:
178181
-Dextra_lib_dirs=/usr/local/lib -Dextra_include_dirs=/usr/local/include/ \
179182
build
180183
EOF
181-
build_script: su postgres -c 'ninja -C build -j${BUILD_JOBS}'
184+
build_script: su postgres -c 'ninja -C build -j${BUILD_JOBS} ${MBUILD_TARGET}'
182185
upload_caches: ccache
183186

184187
test_world_script: |
@@ -380,8 +383,8 @@ task:
380383
build-32
381384
EOF
382385
383-
build_script: su postgres -c 'ninja -C build -j${BUILD_JOBS}'
384-
build_32_script: su postgres -c 'ninja -C build-32 -j${BUILD_JOBS}'
386+
build_script: su postgres -c 'ninja -C build -j${BUILD_JOBS} ${MBUILD_TARGET}'
387+
build_32_script: su postgres -c 'ninja -C build-32 -j${BUILD_JOBS} ${MBUILD_TARGET}'
385388

386389
upload_caches: ccache
387390

@@ -426,6 +429,20 @@ task:
426429
CCACHE_DIR: ${HOME}/ccache
427430
MACPORTS_CACHE: ${HOME}/macports-cache
428431

432+
MACOS_PACKAGE_LIST: >-
433+
ccache
434+
icu
435+
kerberos5
436+
lz4
437+
meson
438+
openldap
439+
openssl
440+
p5.34-io-tty
441+
p5.34-ipc-run
442+
python312
443+
tcl
444+
zstd
445+
429446
CC: ccache cc
430447
CXX: ccache c++
431448
CFLAGS: -Og -ggdb
@@ -461,26 +478,14 @@ task:
461478
macports_cache:
462479
folder: ${MACPORTS_CACHE}
463480
fingerprint_script: |
464-
# Include the OS major version in the cache key. If the OS image changes
465-
# to a different major version, we need to reinstall.
481+
# Reinstall packages if the OS major version, the list of the packages
482+
# to install or the MacPorts install script changes.
466483
sw_vers -productVersion | sed 's/\..*//'
467-
# Also start afresh if we change our MacPorts install script.
484+
echo $MACOS_PACKAGE_LIST
468485
md5 src/tools/ci/ci_macports_packages.sh
469486
reupload_on_changes: true
470487
setup_additional_packages_script: |
471-
sh src/tools/ci/ci_macports_packages.sh \
472-
ccache \
473-
icu \
474-
kerberos5 \
475-
lz4 \
476-
meson \
477-
openldap \
478-
openssl \
479-
p5.34-io-tty \
480-
p5.34-ipc-run \
481-
python312 \
482-
tcl \
483-
zstd
488+
sh src/tools/ci/ci_macports_packages.sh $MACOS_PACKAGE_LIST
484489
# system python doesn't provide headers
485490
sudo /opt/local/bin/port select python3 python312
486491
# Make macports install visible for subsequent steps
@@ -500,7 +505,7 @@ task:
500505
-DPG_TEST_EXTRA="$PG_TEST_EXTRA" \
501506
build
502507
503-
build_script: ninja -C build -j${BUILD_JOBS}
508+
build_script: ninja -C build -j${BUILD_JOBS} ${MBUILD_TARGET}
504509
upload_caches: ccache
505510

506511
test_world_script: |
@@ -573,7 +578,7 @@ task:
573578
574579
build_script: |
575580
vcvarsall x64
576-
ninja -C build
581+
ninja -C build %MBUILD_TARGET%
577582
578583
check_world_script: |
579584
vcvarsall x64
@@ -631,7 +636,7 @@ task:
631636
%BASH% -c "meson setup -Ddebug=true -Doptimization=g -Dcassert=true -Dinjection_points=true -Db_pch=true -Dnls=disabled -DTAR=%TAR% build"
632637
633638
build_script: |
634-
%BASH% -c "ninja -C build"
639+
%BASH% -c "ninja -C build ${MBUILD_TARGET}"
635640
636641
upload_caches: ccache
637642

.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,11 @@ src/interfaces/ecpg/test/expected/* -whitespace
2222
# These files are maintained or generated elsewhere. We take them as is.
2323
configure -whitespace
2424
ppport.h -whitespace
25+
src/backend/jit/llvm/SectionMemoryManager.cpp -whitespace
26+
src/backend/jit/llvm/SectionMemoryManager.LICENSE -whitespace
2527
src/backend/regex/COPYRIGHT -whitespace
2628
src/backend/snowball/libstemmer/*.c -whitespace
2729
src/backend/utils/mb/Unicode/*-std.txt -whitespace
30+
src/include/jit/SectionMemoryManager.h -whitespace
2831
src/include/snowball/libstemmer/* -whitespace
2932
src/timezone/data/* -whitespace

COPYRIGHT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PostgreSQL Database Management System
22
(formerly known as Postgres, then as Postgres95)
33

4-
Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
4+
Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
55

66
Portions Copyright (c) 1994, The Regents of the University of California
77

0 commit comments

Comments
 (0)