From 1319ffd11d4fdbe8838391a76f7ff62aaab40486 Mon Sep 17 00:00:00 2001 From: Jacob Champion Date: Tue, 23 Jun 2026 15:27:54 -0700 Subject: [PATCH v13a.nocfbot 11/11] squash! ci: Make our own msys2 install from scratch, instead of moving Remove unneeded envvars. --- .github/workflows/pg-ci.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 41a36afc2cf..eef86192777 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1138,7 +1138,6 @@ jobs: MSYS: winjitdebug CHERE_INVOKING: 1 - MSYSTEM: UCRT64 # Keep -Dnls explicitly disabled, as the number of files it creates # causes a noticeable slowdown. @@ -1149,11 +1148,6 @@ 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: msys2 {0} @@ -1174,7 +1168,11 @@ jobs: - name: Install MSYS2 uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 with: - msystem: ${{env.MSYSTEM}} + msystem: UCRT64 + # 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. + path-type: inherit update: true location: ${{github.workspace}} install: >- -- 2.34.1