From 81f52c2cc8fe15cb96522da08a43dfa9021f53ae Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Wed, 10 Jun 2026 23:29:47 -0400 Subject: [PATCH v13a 3/9] ci: Make msys2 install smaller We only needed git and diffutils installed via pacman because the already installed tools where hidden by the login script resetting PATH. "Fix" that instead by telling msys to leave the old PATH around. Also don't install libbacktrace it is not needed at the moment. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 81801800dac..442052b72e1 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1056,6 +1056,11 @@ jobs: CCACHE_SLOPPINESS: pch_defines,time_macros CCACHE_DEPEND: 1 + # We don't want using an msys bash to "hide" all the other already + # installed tools, that would require us to install tools into msys that + # are already available otherwise. + MSYS2_PATH_TYPE: inherit + defaults: run: shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' @@ -1086,11 +1091,10 @@ jobs: # MSYS2. It dynamically expands to the correct prefix for the active # shell environment. pacman -S --noconfirm --needed --asdeps \ - git bison flex diffutils \ + bison flex \ ${MINGW_PACKAGE_PREFIX}-ccache \ ${MINGW_PACKAGE_PREFIX}-gcc \ ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libbacktrace \ ${MINGW_PACKAGE_PREFIX}-libxml2 \ ${MINGW_PACKAGE_PREFIX}-libxslt \ ${MINGW_PACKAGE_PREFIX}-lz4 \ -- 2.54.0.450.g9ac3f193c0