@@ -518,6 +518,10 @@ task:
518
518
ccache_cache :
519
519
folder : $CCACHE_DIR
520
520
521
+ ccache_stats_start_script :
522
+ ccache -s
523
+ ccache -z
524
+
521
525
setup_additional_packages_script : |
522
526
#apt-get update
523
527
#DEBIAN_FRONTEND=noninteractive apt-get -y install ...
@@ -526,80 +530,73 @@ task:
526
530
# Test that code can be built with gcc/clang without warnings
527
531
# ##
528
532
529
- setup_script : echo "COPT=-Werror" > src/Makefile.custom
530
-
531
533
# Trace probes have a history of getting accidentally broken. Use the
532
534
# different compilers to build with different combinations of dtrace on/off
533
535
# and cassert on/off.
534
536
535
537
# gcc, cassert off, dtrace on
536
538
always :
537
539
gcc_warning_script : |
538
- time ./configure \
539
- --cache gcc.cache \
540
- --enable-dtrace \
541
- ${LINUX_CONFIGURE_FEATURES} \
542
- CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang"
543
- make -s -j${BUILD_JOBS} clean
544
- time make -s -j${BUILD_JOBS} world-bin
540
+ mkdir build-gcc && cd build-gcc
541
+ CC="ccache gcc" CXX="ccache g++" \
542
+ meson setup \
543
+ -Dwerror=true \
544
+ -Dcassert=false \
545
+ -Ddtrace=enabled \
546
+ ${LINUX_MESON_FEATURES} \
547
+ ..
548
+ time ninja -j${BUILD_JOBS}
545
549
546
550
# gcc, cassert on, dtrace off
547
551
always :
548
552
gcc_a_warning_script : |
549
- time ./configure \
550
- --cache gcc.cache \
551
- --enable-cassert \
552
- ${LINUX_CONFIGURE_FEATURES} \
553
- CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang"
554
- make -s -j${BUILD_JOBS} clean
555
- time make -s -j${BUILD_JOBS} world-bin
553
+ cd build-gcc
554
+ meson configure \
555
+ -Dcassert=true \
556
+ -Ddtrace=disabled
557
+ time ninja -j${BUILD_JOBS}
556
558
557
559
# clang, cassert off, dtrace off
558
560
always :
559
561
clang_warning_script : |
560
- time ./configure \
561
- --cache clang.cache \
562
- ${LINUX_CONFIGURE_FEATURES} \
563
- CC="ccache clang" CXX="ccache clang++" CLANG="ccache clang"
564
- make -s -j${BUILD_JOBS} clean
565
- time make -s -j${BUILD_JOBS} world-bin
562
+ mkdir build-clang && cd build-clang
563
+ CC="ccache clang" CXX="ccache clang++" \
564
+ meson setup \
565
+ -Dwerror=true \
566
+ -Dcassert=false \
567
+ -Ddtrace=disabled \
568
+ ${LINUX_MESON_FEATURES} \
569
+ ..
570
+ time ninja -j${BUILD_JOBS}
566
571
567
572
# clang, cassert on, dtrace on
568
573
always :
569
574
clang_a_warning_script : |
570
- time ./configure \
571
- --cache clang.cache \
572
- --enable-cassert \
573
- --enable-dtrace \
574
- ${LINUX_CONFIGURE_FEATURES} \
575
- CC="ccache clang" CXX="ccache clang++" CLANG="ccache clang"
576
- make -s -j${BUILD_JOBS} clean
577
- time make -s -j${BUILD_JOBS} world-bin
575
+ cd build-clang
576
+ meson configure \
577
+ -Dcassert=true \
578
+ -Ddtrace=enabled
579
+ time ninja -j${BUILD_JOBS}
578
580
579
581
# cross-compile to windows
580
582
always :
581
583
mingw_cross_warning_script : |
582
- time ./configure \
583
- --host=x86_64-w64-mingw32 \
584
- --enable-cassert \
585
- CC="ccache x86_64-w64-mingw32-gcc" \
586
- CXX="ccache x86_64-w64-mingw32-g++"
587
- make -s -j${BUILD_JOBS} clean
588
- time make -s - j${BUILD_JOBS} world-bin
584
+ mkdir build-w64 && cd build-w64
585
+ meson setup \
586
+ --cross-file=../src/tools/ci/linux-mingw-w64-64bit.txt \
587
+ -Dwerror=true \
588
+ -Dcassert=true \
589
+ ..
590
+ time ninja - j${BUILD_JOBS}
589
591
590
592
# ##
591
593
# Verify docs can be built
592
594
# ##
593
595
# XXX: Only do this if there have been changes in doc/ since last build
594
596
always :
595
597
docs_build_script : |
596
- time ./configure \
597
- --cache gcc.cache \
598
- CC="ccache gcc" \
599
- CXX="ccache g++" \
600
- CLANG="ccache clang"
601
- make -s -j${BUILD_JOBS} clean
602
- time make -s -j${BUILD_JOBS} -C doc
598
+ cd build-gcc
599
+ time ninja docs
603
600
604
601
# ##
605
602
# Verify headerscheck / cpluspluscheck succeed
@@ -612,15 +609,19 @@ task:
612
609
# ##
613
610
always :
614
611
headers_headerscheck_script : |
615
- time ./configure \
612
+ mkdir build-ac && cd build-ac
613
+ time ../configure \
616
614
${LINUX_CONFIGURE_FEATURES} \
617
615
--without-icu \
618
616
--quiet \
619
- CC="gcc" CXX"= g++" CLANG="clang"
620
- make -s -j${BUILD_JOBS} clean
617
+ CC="gcc" CXX=" g++" CLANG="clang"
618
+ make -s -j${BUILD_JOBS} world-bin
621
619
time make -s headerscheck EXTRAFLAGS='-fmax-errors=10'
622
620
headers_cpluspluscheck_script : |
621
+ cd build-ac
623
622
time make -s cpluspluscheck EXTRAFLAGS='-fmax-errors=10'
624
623
625
624
always :
625
+ ccache_stats_end_script :
626
+ ccache -s
626
627
upload_caches : ccache
0 commit comments