Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 4128453

Browse files
committed
ci: Use newer LLVM version with gcc, to avoid compiler warnings
gcc emits a warning for LLVM 14 code outside of our control. To avoid that, update to a newer LLVM version. Do so both in the CompilerWarnings and normal tasks - the latter don't fail, but the warnings make it more likely that we'd miss other warnings. We might want to backpatch this eventually. The higher priority right now is to unbreak CI though - which is only broken on master, due to 0c3930d interacting badly with c8a6ec2 (mea culpa, I should have noticed this before pushing, but I missed it due to another, independent CI failure). Discussion: https://postgr.es/m/20240715193754.awdxgrzurxnwwu2t@awork3.anarazel.de
1 parent 8e28778 commit 4128453

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

.cirrus.tasks.yml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,8 @@ task:
272272
LDFLAGS: $SANITIZER_FLAGS
273273
CC: ccache gcc
274274
CXX: ccache g++
275+
# GCC emits a warning for llvm-14, so switch to a newer one.
276+
LLVM_CONFIG: llvm-config-16
275277

276278
LINUX_CONFIGURE_FEATURES: *LINUX_CONFIGURE_FEATURES
277279
LINUX_MESON_FEATURES: *LINUX_MESON_FEATURES
@@ -334,7 +336,7 @@ task:
334336
\
335337
${LINUX_CONFIGURE_FEATURES} \
336338
\
337-
CLANG="ccache clang"
339+
CLANG="ccache clang-16"
338340
EOF
339341
build_script: su postgres -c "make -s -j${BUILD_JOBS} world-bin"
340342
upload_caches: ccache
@@ -661,6 +663,9 @@ task:
661663
LINUX_CONFIGURE_FEATURES: *LINUX_CONFIGURE_FEATURES
662664
LINUX_MESON_FEATURES: *LINUX_MESON_FEATURES
663665

666+
# GCC emits a warning for llvm-14, so switch to a newer one.
667+
LLVM_CONFIG: llvm-config-16
668+
664669
<<: *linux_task_template
665670

666671
sysinfo_script: |
@@ -696,7 +701,7 @@ task:
696701
--cache gcc.cache \
697702
--enable-dtrace \
698703
${LINUX_CONFIGURE_FEATURES} \
699-
CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang"
704+
CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang-16"
700705
make -s -j${BUILD_JOBS} clean
701706
time make -s -j${BUILD_JOBS} world-bin
702707
@@ -707,7 +712,7 @@ task:
707712
--cache gcc.cache \
708713
--enable-cassert \
709714
${LINUX_CONFIGURE_FEATURES} \
710-
CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang"
715+
CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang-16"
711716
make -s -j${BUILD_JOBS} clean
712717
time make -s -j${BUILD_JOBS} world-bin
713718
@@ -717,7 +722,7 @@ task:
717722
time ./configure \
718723
--cache clang.cache \
719724
${LINUX_CONFIGURE_FEATURES} \
720-
CC="ccache clang" CXX="ccache clang++" CLANG="ccache clang"
725+
CC="ccache clang" CXX="ccache clang++-16" CLANG="ccache clang-16"
721726
make -s -j${BUILD_JOBS} clean
722727
time make -s -j${BUILD_JOBS} world-bin
723728
@@ -729,7 +734,7 @@ task:
729734
--enable-cassert \
730735
--enable-dtrace \
731736
${LINUX_CONFIGURE_FEATURES} \
732-
CC="ccache clang" CXX="ccache clang++" CLANG="ccache clang"
737+
CC="ccache clang" CXX="ccache clang++-16" CLANG="ccache clang-16"
733738
make -s -j${BUILD_JOBS} clean
734739
time make -s -j${BUILD_JOBS} world-bin
735740
@@ -753,9 +758,7 @@ task:
753758
docs_build_script: |
754759
time ./configure \
755760
--cache gcc.cache \
756-
CC="ccache gcc" \
757-
CXX="ccache g++" \
758-
CLANG="ccache clang"
761+
CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang-16"
759762
make -s -j${BUILD_JOBS} clean
760763
time make -s -j${BUILD_JOBS} -C doc
761764
@@ -774,7 +777,7 @@ task:
774777
${LINUX_CONFIGURE_FEATURES} \
775778
--without-icu \
776779
--quiet \
777-
CC="gcc" CXX"=g++" CLANG="clang"
780+
CC="gcc" CXX"=g++" CLANG="clang-16"
778781
make -s -j${BUILD_JOBS} clean
779782
time make -s headerscheck EXTRAFLAGS='-fmax-errors=10'
780783
headers_cpluspluscheck_script: |

0 commit comments

Comments
 (0)