From ade28951f5af0d6eb602e529d1b31b42247f218c Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Mon, 22 Jun 2026 12:20:52 -0400 Subject: [PATCH v14 2/6] ci: Make msys2 install smaller We only needed git and diffutils installed via pacman because the already installed tools were 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. Author: Andres Freund 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 19bb0048506..34153a9b5da 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1066,6 +1066,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}"' @@ -1096,11 +1101,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.47.3