Skip to content

Commit eeabf8b

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 00bdbac commit eeabf8b

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

.cirrus.tasks.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -138,13 +138,13 @@ LINUX_CONFIGURE_FEATURES: &LINUX_CONFIGURE_FEATURES >-
138138

139139

140140
task:
141-
name: Linux - Debian Bookworm
141+
name: Linux - Debian Trixie
142142

143143
env:
144144
CPUS: 4
145145
BUILD_JOBS: 4
146146
TEST_JOBS: 8 # experimentally derived to be a decent choice
147-
IMAGE_FAMILY: pg-ci-bookworm
147+
IMAGE_FAMILY: pg-ci-trixie
148148

149149
CCACHE_DIR: /tmp/ccache_dir
150150
DEBUGINFOD_URLS: "https://debuginfod.debian.net"
@@ -460,12 +460,12 @@ task:
460460

461461
# To limit unnecessary work only run this once the normal linux test succeeds
462462
depends_on:
463-
- Linux - Debian Bookworm
463+
- Linux - Debian Trixie
464464

465465
env:
466466
CPUS: 4
467467
BUILD_JOBS: 4
468-
IMAGE_FAMILY: pg-ci-bookworm
468+
IMAGE_FAMILY: pg-ci-trixie
469469

470470
# Use larger ccache cache, as this task compiles with multiple compilers /
471471
# flag combinations
@@ -554,10 +554,10 @@ task:
554554
always:
555555
mingw_cross_warning_script: |
556556
time ./configure \
557-
--host=x86_64-w64-mingw32 \
557+
--host=x86_64-w64-mingw32ucrt \
558558
--enable-cassert \
559-
CC="ccache x86_64-w64-mingw32-gcc" \
560-
CXX="ccache x86_64-w64-mingw32-g++"
559+
CC="ccache x86_64-w64-mingw32ucrt-gcc" \
560+
CXX="ccache x86_64-w64-mingw32ucrt-g++"
561561
make -s -j${BUILD_JOBS} clean
562562
time make -s -j${BUILD_JOBS} world-bin
563563

0 commit comments

Comments
 (0)