agora inbox for [email protected]help / color / mirror / Atom feed
[PATCH v1 2/2] run pgindent 130+ messages / 2 participants [nested] [flat]
* [PATCH v1 2/2] run pgindent @ 2026-05-05 21:04 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 130+ messages in thread From: Nathan Bossart @ 2026-05-05 21:04 UTC (permalink / raw) --- src/backend/replication/logical/logicalfuncs.c | 2 +- src/backend/storage/ipc/dsm_registry.c | 2 +- src/bin/pg_basebackup/pg_basebackup.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/backend/replication/logical/logicalfuncs.c b/src/backend/replication/logical/logicalfuncs.c index 512013b0ef0..71fbaf72269 100644 --- a/src/backend/replication/logical/logicalfuncs.c +++ b/src/backend/replication/logical/logicalfuncs.c @@ -218,7 +218,7 @@ pg_logical_slot_get_changes_guts(FunctionCallInfo fcinfo, bool confirm, bool bin * what we need. */ if (!binary && - ctx->options.output_type !=OUTPUT_PLUGIN_TEXTUAL_OUTPUT) + ctx->options.output_type != OUTPUT_PLUGIN_TEXTUAL_OUTPUT) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("logical decoding output plugin \"%s\" produces binary output, but function \"%s\" expects textual data", diff --git a/src/backend/storage/ipc/dsm_registry.c b/src/backend/storage/ipc/dsm_registry.c index 2b56977659b..b9961c26019 100644 --- a/src/backend/storage/ipc/dsm_registry.c +++ b/src/backend/storage/ipc/dsm_registry.c @@ -479,7 +479,7 @@ pg_get_dsm_registry_allocations(PG_FUNCTION_ARGS) entry->dsa.handle != DSA_HANDLE_INVALID) vals[2] = Int64GetDatum(dsa_get_total_size_from_handle(entry->dsa.handle)); else if (entry->type == DSMR_ENTRY_TYPE_DSH && - entry->dsh.dsa_handle !=DSA_HANDLE_INVALID) + entry->dsh.dsa_handle != DSA_HANDLE_INVALID) vals[2] = Int64GetDatum(dsa_get_total_size_from_handle(entry->dsh.dsa_handle)); else nulls[2] = true; diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c index c1a4672aa6f..80dc3bbc8da 100644 --- a/src/bin/pg_basebackup/pg_basebackup.c +++ b/src/bin/pg_basebackup/pg_basebackup.c @@ -1282,7 +1282,7 @@ ReceiveArchiveStream(PGconn *conn, pg_compress_specification *compress) ReceiveCopyData(conn, ReceiveArchiveStreamChunk, &state); /* If we wrote the backup manifest to a file, close the file. */ - if (state.manifest_file !=NULL) + if (state.manifest_file != NULL) { fclose(state.manifest_file); state.manifest_file = NULL; @@ -1341,7 +1341,7 @@ ReceiveArchiveStreamChunk(size_t r, char *copybuf, void *callback_data) /* Sanity check. */ if (state->manifest_buffer != NULL || - state->manifest_file !=NULL) + state->manifest_file != NULL) pg_fatal("archives must precede manifest"); /* Parse the rest of the CopyData message. */ @@ -1406,7 +1406,7 @@ ReceiveArchiveStreamChunk(size_t r, char *copybuf, void *callback_data) appendPQExpBuffer(state->manifest_buffer, copybuf + 1, r - 1); } - else if (state->manifest_file !=NULL) + else if (state->manifest_file != NULL) { /* Manifest data, write to disk. */ if (fwrite(copybuf + 1, r - 1, 1, -- 2.50.1 (Apple Git-155) --k2Vi/uo5iFea1Gni-- ^ permalink raw reply [nested|flat] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ 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 <[email protected]> 0 siblings, 0 replies; 130+ 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] 130+ messages in thread
end of thread, other threads:[~2026-06-09 14:18 UTC | newest] Thread overview: 130+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2026-05-05 21:04 [PATCH v1 2/2] run pgindent Nathan Bossart <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]> 2026-06-09 14:18 [PATCH v13a 2/9] ci: Use meson for most of CompilerWarnings, it's a lot faster Andres Freund <[email protected]>
This inbox is served by agora; see mirroring instructions for how to clone and mirror all data and code used for this inbox