agora inbox for pgsql-hackers@postgresql.orghelp / color / mirror / Atom feed
[PATCH v22 4/8] Row pattern recognition patch (planner). 249+ messages / 2 participants [nested] [flat]
* [PATCH v22 4/8] Row pattern recognition patch (planner). @ 2024-09-19 04:48 Tatsuo Ishii <ishii@postgresql.org> 0 siblings, 0 replies; 249+ messages in thread From: Tatsuo Ishii @ 2024-09-19 04:48 UTC (permalink / raw) --- src/backend/optimizer/plan/createplan.c | 24 +++++++++++++++----- src/backend/optimizer/plan/planner.c | 3 +++ src/backend/optimizer/plan/setrefs.c | 27 ++++++++++++++++++++++- src/backend/optimizer/prep/prepjointree.c | 9 ++++++++ src/include/nodes/plannodes.h | 19 ++++++++++++++++ 5 files changed, 76 insertions(+), 6 deletions(-) diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c index bb45ef318f..b0adb9cbd8 100644 --- a/src/backend/optimizer/plan/createplan.c +++ b/src/backend/optimizer/plan/createplan.c @@ -288,9 +288,11 @@ static WindowAgg *make_windowagg(List *tlist, Index winref, int ordNumCols, AttrNumber *ordColIdx, Oid *ordOperators, Oid *ordCollations, int frameOptions, Node *startOffset, Node *endOffset, Oid startInRangeFunc, Oid endInRangeFunc, - Oid inRangeColl, bool inRangeAsc, bool inRangeNullsFirst, - List *runCondition, List *qual, bool topWindow, - Plan *lefttree); + Oid inRangeColl, bool inRangeAsc, bool inRangeNullsFirst, List *runCondition, + RPSkipTo rpSkipTo, List *patternVariable, List *patternRegexp, + List *defineClause, + List *defineInitial, + List *qual, bool topWindow, Plan *lefttree); static Group *make_group(List *tlist, List *qual, int numGroupCols, AttrNumber *grpColIdx, Oid *grpOperators, Oid *grpCollations, Plan *lefttree); @@ -2697,6 +2699,11 @@ create_windowagg_plan(PlannerInfo *root, WindowAggPath *best_path) wc->inRangeAsc, wc->inRangeNullsFirst, best_path->runCondition, + wc->rpSkipTo, + wc->patternVariable, + wc->patternRegexp, + wc->defineClause, + wc->defineInitial, best_path->qual, best_path->topwindow, subplan); @@ -6631,8 +6638,10 @@ make_windowagg(List *tlist, Index winref, int ordNumCols, AttrNumber *ordColIdx, Oid *ordOperators, Oid *ordCollations, int frameOptions, Node *startOffset, Node *endOffset, Oid startInRangeFunc, Oid endInRangeFunc, - Oid inRangeColl, bool inRangeAsc, bool inRangeNullsFirst, - List *runCondition, List *qual, bool topWindow, Plan *lefttree) + Oid inRangeColl, bool inRangeAsc, bool inRangeNullsFirst, List *runCondition, + RPSkipTo rpSkipTo, List *patternVariable, List *patternRegexp, List *defineClause, + List *defineInitial, + List *qual, bool topWindow, Plan *lefttree) { WindowAgg *node = makeNode(WindowAgg); Plan *plan = &node->plan; @@ -6658,6 +6667,11 @@ make_windowagg(List *tlist, Index winref, node->inRangeAsc = inRangeAsc; node->inRangeNullsFirst = inRangeNullsFirst; node->topWindow = topWindow; + node->rpSkipTo = rpSkipTo, + node->patternVariable = patternVariable; + node->patternRegexp = patternRegexp; + node->defineClause = defineClause; + node->defineInitial = defineInitial; plan->targetlist = tlist; plan->lefttree = lefttree; diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index d92d43a17e..771b4b051d 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -879,6 +879,9 @@ subquery_planner(PlannerGlobal *glob, Query *parse, PlannerInfo *parent_root, EXPRKIND_LIMIT); wc->endOffset = preprocess_expression(root, wc->endOffset, EXPRKIND_LIMIT); + wc->defineClause = (List *) preprocess_expression(root, + (Node *) wc->defineClause, + EXPRKIND_TARGET); } parse->limitOffset = preprocess_expression(root, parse->limitOffset, diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c index 91c7c4fe2f..b5310e0d72 100644 --- a/src/backend/optimizer/plan/setrefs.c +++ b/src/backend/optimizer/plan/setrefs.c @@ -211,7 +211,6 @@ static List *set_windowagg_runcondition_references(PlannerInfo *root, List *runcondition, Plan *plan); - /***************************************************************************** * * SUBPLAN REFERENCES @@ -2495,6 +2494,32 @@ set_upper_references(PlannerInfo *root, Plan *plan, int rtoffset) NRM_EQUAL, NUM_EXEC_QUAL(plan)); + /* + * Modifies an expression tree in each DEFINE clause so that all Var + * nodes's varno refers to OUTER_VAR. + */ + if (IsA(plan, WindowAgg)) + { + WindowAgg *wplan = (WindowAgg *) plan; + + if (wplan->defineClause != NIL) + { + foreach(l, wplan->defineClause) + { + TargetEntry *tle = (TargetEntry *) lfirst(l); + + tle->expr = (Expr *) + fix_upper_expr(root, + (Node *) tle->expr, + subplan_itlist, + OUTER_VAR, + rtoffset, + NRM_EQUAL, + NUM_EXEC_QUAL(plan)); + } + } + } + pfree(subplan_itlist); } diff --git a/src/backend/optimizer/prep/prepjointree.c b/src/backend/optimizer/prep/prepjointree.c index a70404558f..d4b08a2e48 100644 --- a/src/backend/optimizer/prep/prepjointree.c +++ b/src/backend/optimizer/prep/prepjointree.c @@ -2176,6 +2176,15 @@ perform_pullup_replace_vars(PlannerInfo *root, parse->returningList = (List *) pullup_replace_vars((Node *) parse->returningList, rvcontext); + foreach(lc, parse->windowClause) + { + WindowClause *wc = lfirst_node(WindowClause, lc); + + if (wc->defineClause != NIL) + wc->defineClause = (List *) + pullup_replace_vars((Node *) wc->defineClause, rvcontext); + } + if (parse->onConflict) { parse->onConflict->onConflictSet = (List *) diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h index 62cd6a6666..b7b2ac4aaf 100644 --- a/src/include/nodes/plannodes.h +++ b/src/include/nodes/plannodes.h @@ -20,6 +20,7 @@ #include "lib/stringinfo.h" #include "nodes/bitmapset.h" #include "nodes/lockoptions.h" +#include "nodes/parsenodes.h" #include "nodes/primnodes.h" @@ -1099,6 +1100,24 @@ typedef struct WindowAgg /* nulls sort first for in_range tests? */ bool inRangeNullsFirst; + /* Row Pattern Recognition AFTER MACH SKIP clause */ + RPSkipTo rpSkipTo; /* Row Pattern Skip To type */ + + /* Row Pattern PATTERN variable name (list of String) */ + List *patternVariable; + + /* + * Row Pattern RPATTERN regular expression quantifier ('+' or ''. list of + * String) + */ + List *patternRegexp; + + /* Row Pattern DEFINE clause (list of TargetEntry) */ + List *defineClause; + + /* Row Pattern DEFINE variable initial names (list of String) */ + List *defineInitial; + /* * false for all apart from the WindowAgg that's closest to the root of * the plan -- 2.25.1 ----Next_Part(Thu_Sep_19_13_59_47_2024_608)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="v22-0005-Row-pattern-recognition-patch-executor.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster @ 2026-06-09 14:18 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-09 14:18 UTC (permalink / raw) Previously, with a cold cache or a change in a central header, the CompilerWarnings job would take ~35 minutes. The worst aspect of that was the windows cross build, which would take about 8-10 minutes. Migrate the compiler warnings tasks to meson, that generally makes the cold-cache build a bit faster, and makes the windows cross build a *lot* faster, due to being able to use precompiled headers. With that the cold cache performance improves to about 12 minutes. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 38 +++++++++++++-------------- src/tools/ci/meson-cross-w64-ucrt.txt | 21 +++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/tools/ci/meson-cross-w64-ucrt.txt diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 742a8431782..81801800dac 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1171,6 +1171,8 @@ jobs: # compilers / flag combinations. CCACHE_MAXSIZE: "1G" DEFAULT_BUILD: world-bin + CCACHE_SLOPPINESS: pch_defines,time_macros + CCACHE_DEPEND: 1 steps: - *nix_sysinfo_step @@ -1186,53 +1188,56 @@ jobs: - name: gcc warnings + (dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Ddtrace=enabled CC: ccache gcc CXX: ccache g++ CLANG: ccache clang run: &compiler_warnings_cmd | echo "::group::configure" - ./configure \ - ${{env.CONF}} \ - CLANG="ccache clang" + rm -rf build-meson + meson setup -Dwerror=true $CONF build-meson echo "::endgroup::" - make -s -j${{env.BUILD_JOBS}} clean - make -s -j${{env.BUILD_JOBS}} ${{env.DEFAULT_BUILD}} + ninja -C build-meson --quiet -j${{env.BUILD_JOBS}} ${{env.MBUILD_TARGET}} # gcc, cassert on, dtrace off - name: gcc warnings + (cassert) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache gcc.cache --enable-cassert + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true CC: ccache gcc CXX: ccache g++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert off, dtrace off - name: clang warnings if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache + CONF: ${{env.MESON_COMMON_FEATURES}} CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd # clang, cassert on, dtrace on - name: clang warnings + (cassert + dtrace) if: ${{ !cancelled() }} env: - CONF: ${{env.LINUX_CONFIGURE_FEATURES}} --cache clang.cache --enable-cassert --enable-dtrace + CONF: ${{env.MESON_COMMON_FEATURES}} -Dcassert=true -Ddtrace=enabled CC: ccache clang CXX: ccache clang++ + CLANG: ccache clang run: *compiler_warnings_cmd - name: mingw warnings (cross compilation) if: ${{ !cancelled() }} env: - CONF: --host=x86_64-w64-mingw32ucrt --enable-cassert --without-icu - CC: ccache x86_64-w64-mingw32ucrt-gcc - CXX: ccache x86_64-w64-mingw32ucrt-g++ + CONF: >- + --cross-file src/tools/ci/meson-cross-w64-ucrt.txt + --buildtype debug + -Db_pch=true + -Dcassert=true run: *compiler_warnings_cmd ### @@ -1241,12 +1246,8 @@ jobs: # XXX: Only do this if there have been changes in doc/ since last build - name: Build documentation if: ${{ !cancelled() }} - env: - CONF: --cache gcc.cache - CC: ccache gcc - CXX: ccache g++ - DEFAULT_BUILD: -C doc - run: *compiler_warnings_cmd + run: + ninja -C build-meson docs ### # Verify headerscheck / cpluspluscheck succeed @@ -1261,7 +1262,6 @@ jobs: echo "::group::configure" ./configure \ ${{env.LINUX_CONFIGURE_FEATURES}} \ - --cache gcc.cache \ --quiet \ CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang" echo "::endgroup::" diff --git a/src/tools/ci/meson-cross-w64-ucrt.txt b/src/tools/ci/meson-cross-w64-ucrt.txt new file mode 100644 index 00000000000..b6144979416 --- /dev/null +++ b/src/tools/ci/meson-cross-w64-ucrt.txt @@ -0,0 +1,21 @@ +[constants] +triple = 'x86_64-w64-mingw32ucrt' +prefix = '/usr/bin' / triple + '-' + +[binaries] +c = ['ccache', prefix + 'gcc'] +cpp = ['ccache', prefix + 'g++'] +ar = prefix + 'ar' +strip = prefix + 'strip' +pkg-config = prefix + 'pkg-config' +windres = prefix + 'windres' + +[properties] +# Directory that contains 'bin', 'lib', etc +root = '/usr/x86_64-w64-mingw32ucrt' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0003-ci-Make-msys2-install-smaller.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
end of thread, other threads:[~2026-06-09 14:18 UTC | newest] Thread overview: 249+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2024-09-19 04:48 [PATCH v22 4/8] Row pattern recognition patch (planner). Tatsuo Ishii <ishii@postgresql.org> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <andres@anarazel.de>
This inbox is served by agora; see mirroring instructions for how to clone and mirror all data and code used for this inbox