Skip to content

Commit b81489d

Browse files
committed
ci: debian: Switch to Debian Trixie release
Debian Trixie CI images are generated now [1], so use them with the following changes: - detect_stack_use_after_return=0 option is added to the ASAN_OPTIONS because ASAN uses a "shadow stack" to track stack variable lifetimes and this confuses Postgres' stack depth check [2]. - Perl is updated to the newer version (perl5.40-i386-linux-gnu). - LLVM-14 is no longer default installation, no need to force using LLVM-16. - Switch MinGW CC/CXX to x86_64-w64-mingw32ucrt-* to fix build failure from missing _iswctype_l in mingw-w64 v12 headers. [1] anarazel/pg-vm-images@35a144793f [2] https://postgr.es/m/20240130212304.q66rquj5es4375ab%40awork3.anarazel.de Author: Nazir Bilal Yavuz <byavuz81@gmail.com> Discussion: https://postgr.es/m/CAN55FZ1_B1usTskAv+AYt1bA7abVd9YH6XrUUSbr-2Z0d5Wd8w@mail.gmail.com Backpatch: 15-, where CI support was added
1 parent 50fbd09 commit b81489d

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

.cirrus.tasks.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ task:
6868
CPUS: 4
6969
BUILD_JOBS: 8
7070
TEST_JOBS: 8
71-
IMAGE_FAMILY: pg-ci-bookworm
71+
IMAGE_FAMILY: pg-ci-trixie
7272
CCACHE_DIR: ${CIRRUS_WORKING_DIR}/ccache_dir
7373
# no options enabled, should be small
7474
CCACHE_MAXSIZE: "150M"
@@ -244,7 +244,7 @@ task:
244244
CPUS: 4
245245
BUILD_JOBS: 4
246246
TEST_JOBS: 8 # experimentally derived to be a decent choice
247-
IMAGE_FAMILY: pg-ci-bookworm
247+
IMAGE_FAMILY: pg-ci-trixie
248248

249249
CCACHE_DIR: /tmp/ccache_dir
250250
DEBUGINFOD_URLS: "https://debuginfod.debian.net"
@@ -265,7 +265,7 @@ task:
265265
# print_stacktraces=1,verbosity=2, duh
266266
# detect_leaks=0: too many uninteresting leak errors in short-lived binaries
267267
UBSAN_OPTIONS: print_stacktrace=1:disable_coredump=0:abort_on_error=1:verbosity=2
268-
ASAN_OPTIONS: print_stacktrace=1:disable_coredump=0:abort_on_error=1:detect_leaks=0
268+
ASAN_OPTIONS: print_stacktrace=1:disable_coredump=0:abort_on_error=1:detect_leaks=0:detect_stack_use_after_return=0
269269

270270
# SANITIZER_FLAGS is set in the tasks below
271271
CFLAGS: -Og -ggdb -fno-sanitize-recover=all $SANITIZER_FLAGS
@@ -315,7 +315,7 @@ task:
315315
#DEBIAN_FRONTEND=noninteractive apt-get -y install ...
316316
317317
matrix:
318-
- name: Linux - Debian Bookworm - Autoconf
318+
- name: Linux - Debian Trixie - Autoconf
319319

320320
env:
321321
SANITIZER_FLAGS: -fsanitize=address
@@ -349,7 +349,7 @@ task:
349349
on_failure:
350350
<<: *on_failure_ac
351351

352-
- name: Linux - Debian Bookworm - Meson
352+
- name: Linux - Debian Trixie - Meson
353353

354354
env:
355355
CCACHE_MAXSIZE: "400M" # tests two different builds
@@ -376,7 +376,7 @@ task:
376376
${LINUX_MESON_FEATURES} \
377377
-Dllvm=disabled \
378378
--pkg-config-path /usr/lib/i386-linux-gnu/pkgconfig/ \
379-
-DPERL=perl5.36-i386-linux-gnu \
379+
-DPERL=perl5.40-i386-linux-gnu \
380380
-DPG_TEST_EXTRA="$PG_TEST_EXTRA" \
381381
build-32
382382
EOF
@@ -655,7 +655,7 @@ task:
655655
env:
656656
CPUS: 4
657657
BUILD_JOBS: 4
658-
IMAGE_FAMILY: pg-ci-bookworm
658+
IMAGE_FAMILY: pg-ci-trixie
659659

660660
# Use larger ccache cache, as this task compiles with multiple compilers /
661661
# flag combinations
@@ -741,11 +741,11 @@ task:
741741
always:
742742
mingw_cross_warning_script: |
743743
time ./configure \
744-
--host=x86_64-w64-mingw32 \
744+
--host=x86_64-w64-mingw32ucrt \
745745
--enable-cassert \
746746
--without-icu \
747-
CC="ccache x86_64-w64-mingw32-gcc" \
748-
CXX="ccache x86_64-w64-mingw32-g++"
747+
CC="ccache x86_64-w64-mingw32ucrt-gcc" \
748+
CXX="ccache x86_64-w64-mingw32ucrt-g++"
749749
make -s -j${BUILD_JOBS} clean
750750
time make -s -j${BUILD_JOBS} world-bin
751751

0 commit comments

Comments
 (0)