agora inbox for pgsql-hackers@postgresql.orghelp / color / mirror / Atom feed
[PATCH v2 2/7] Row pattern recognition patch (parse/analysis). 249+ messages / 2 participants [nested] [flat]
* [PATCH v2 2/7] Row pattern recognition patch (parse/analysis). @ 2023-06-26 08:05 Tatsuo Ishii <ishii@postgresql.org> 0 siblings, 0 replies; 249+ messages in thread From: Tatsuo Ishii @ 2023-06-26 08:05 UTC (permalink / raw) --- src/backend/parser/parse_agg.c | 7 ++ src/backend/parser/parse_clause.c | 192 +++++++++++++++++++++++++++++- src/backend/parser/parse_expr.c | 4 + src/backend/parser/parse_func.c | 3 + 4 files changed, 205 insertions(+), 1 deletion(-) diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c index 85cd47b7ae..aa7a1cee80 100644 --- a/src/backend/parser/parse_agg.c +++ b/src/backend/parser/parse_agg.c @@ -564,6 +564,10 @@ check_agglevels_and_constraints(ParseState *pstate, Node *expr) errkind = true; break; + case EXPR_KIND_RPR_DEFINE: + errkind = true; + break; + /* * There is intentionally no default: case here, so that the * compiler will warn if we add a new ParseExprKind without @@ -953,6 +957,9 @@ transformWindowFuncCall(ParseState *pstate, WindowFunc *wfunc, case EXPR_KIND_CYCLE_MARK: errkind = true; break; + case EXPR_KIND_RPR_DEFINE: + errkind = true; + break; /* * There is intentionally no default: case here, so that the diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c index f61f794755..ccf3332bef 100644 --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -100,7 +100,10 @@ static WindowClause *findWindowClause(List *wclist, const char *name); static Node *transformFrameOffset(ParseState *pstate, int frameOptions, Oid rangeopfamily, Oid rangeopcintype, Oid *inRangeFunc, Node *clause); - +static void transformRPR(ParseState *pstate, WindowClause *wc, WindowDef *windef); +static List *transformDefineClause(ParseState *pstate, WindowClause *wc, WindowDef *windef); +static List *transformPatternClause(ParseState *pstate, WindowClause *wc, WindowDef *windef); +static List *transformMeasureClause(ParseState *pstate, WindowClause *wc, WindowDef *windef); /* * transformFromClause - @@ -2949,6 +2952,10 @@ transformWindowDefinitions(ParseState *pstate, rangeopfamily, rangeopcintype, &wc->endInRangeFunc, windef->endOffset); + + /* Process Row Pattern Recognition related clauses */ + transformRPR(pstate, wc, windef); + wc->runCondition = NIL; wc->winref = winref; @@ -3814,3 +3821,186 @@ transformFrameOffset(ParseState *pstate, int frameOptions, return node; } + +/* + * transformRPR + * Process Row Pattern Recognition related clauses + */ +static void +transformRPR(ParseState *pstate, WindowClause *wc, WindowDef *windef) +{ + /* Check Frame option. Frame must start at current row */ + + /* + * Window definition exists? + */ + if (windef == NULL) + return; + + /* + * Row Pattern Common Syntax clause exists? + */ + if (windef->rpCommonSyntax == NULL) + return; + + if ((wc->frameOptions & FRAMEOPTION_START_CURRENT_ROW) == 0) + ereport(ERROR, + (errcode(ERRCODE_SYNTAX_ERROR), + errmsg("FRAME must start at current row when row patttern recognition is used"))); + + /* Transform AFTER MACH SKIP TO clause */ + wc->rpSkipTo = windef->rpCommonSyntax->rpSkipTo; + + /* Transform SEEK or INITIAL clause */ + wc->initial = windef->rpCommonSyntax->initial; + + /* Transform DEFINE clause into list of TargetEntry's */ + wc->defineClause = transformDefineClause(pstate, wc, windef); + + /* Check PATTERN clause and copy to patternClause */ + transformPatternClause(pstate, wc, windef); + + /* Transform MEASURE clause */ + transformMeasureClause(pstate, wc, windef); +} + +/* + * transformDefineClause Process DEFINE clause and transform ResTarget into + * list of TargetEntry. + * + * XXX we only support column reference in row pattern definition search + * condition, e.g. "price". <row pattern definition variable name>.<column + * reference> is not supported, e.g. "A.price". + */ +static List * +transformDefineClause(ParseState *pstate, WindowClause *wc, WindowDef *windef) +{ + ListCell *lc; + ResTarget *restarget, *r; + List *restargets; + + + /* + * If Row Definition Common Syntax exists, DEFINE clause must exist. + * (the raw parser should have already checked it.) + */ + Assert(windef->rpCommonSyntax->rpDefs != NULL); + + /* + * Check for duplicate row pattern definition variables. The standard + * requires that no two row pattern definition variable names shall be + * equivalent. + */ + restargets = NIL; + foreach(lc, windef->rpCommonSyntax->rpDefs) + { + char *name; + ListCell *l; + + restarget = (ResTarget *)lfirst(lc); + name = restarget->name; + + /* + * Make sure that row pattern definition search condition is a boolean + * expression. + */ + transformWhereClause(pstate, restarget->val, + EXPR_KIND_RPR_DEFINE, "DEFINE"); + + foreach(l, restargets) + { + char *n; + + r = (ResTarget *) lfirst(l); + n = r->name; + + if (!strcmp(n, name)) + ereport(ERROR, + (errcode(ERRCODE_SYNTAX_ERROR), + errmsg("row pattern definition variable name \"%s\" appears more than once in DEFINE clause", + name), + parser_errposition(pstate, exprLocation((Node *)r)))); + } + restargets = lappend(restargets, restarget); + } + list_free(restargets); + + return transformTargetList(pstate, windef->rpCommonSyntax->rpDefs, + EXPR_KIND_RPR_DEFINE); +} + +/* + * transformPatternClause + * Process PATTERN clause and return PATTERN clause in the raw parse tree + */ +static List * +transformPatternClause(ParseState *pstate, WindowClause *wc, WindowDef *windef) +{ + List *patterns; + ListCell *lc, *l; + + /* + * Row Pattern Common Syntax clause exists? + */ + if (windef->rpCommonSyntax == NULL) + return NULL; + + /* + * Primary row pattern variable names in PATTERN clause must appear in + * DEFINE clause as row pattern definition variable names. + */ + wc->patternVariable = NIL; + wc->patternRegexp = NIL; + foreach(lc, windef->rpCommonSyntax->rpPatterns) + { + A_Expr *a; + char *name; + char *regexp; + bool found = false; + + if (!IsA(lfirst(lc), A_Expr)) + ereport(ERROR, + errmsg("node type is not A_Expr")); + + a = (A_Expr *)lfirst(lc); + name = strVal(a->lexpr); + + foreach(l, windef->rpCommonSyntax->rpDefs) + { + ResTarget *restarget = (ResTarget *)lfirst(l); + + if (!strcmp(restarget->name, name)) + { + found = true; + break; + } + } + + if (!found) + ereport(ERROR, + (errcode(ERRCODE_SYNTAX_ERROR), + errmsg("primary row pattern variable name \"%s\" does not appear in DEFINE clause", + name), + parser_errposition(pstate, exprLocation((Node *)a)))); + wc->patternVariable = lappend(wc->patternVariable, makeString(pstrdup(name))); + regexp = strVal(lfirst(list_head(a->name))); + wc->patternRegexp = lappend(wc->patternRegexp, makeString(pstrdup(regexp))); + } + return patterns; +} + +/* + * transformMeasureClause + * Process MEASURE clause + */ +static List * +transformMeasureClause(ParseState *pstate, WindowClause *wc, WindowDef *windef) +{ + if (windef->rowPatternMeasures == NIL) + return NIL; + + ereport(ERROR, + (errcode(ERRCODE_SYNTAX_ERROR), + errmsg("%s","MEASURE clause is not supported yet"), + parser_errposition(pstate, exprLocation((Node *)windef->rowPatternMeasures)))); +} diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c index 346fd272b6..20231d9ec0 100644 --- a/src/backend/parser/parse_expr.c +++ b/src/backend/parser/parse_expr.c @@ -541,6 +541,7 @@ transformColumnRef(ParseState *pstate, ColumnRef *cref) case EXPR_KIND_COPY_WHERE: case EXPR_KIND_GENERATED_COLUMN: case EXPR_KIND_CYCLE_MARK: + case EXPR_KIND_RPR_DEFINE: /* okay */ break; @@ -1754,6 +1755,7 @@ transformSubLink(ParseState *pstate, SubLink *sublink) case EXPR_KIND_VALUES: case EXPR_KIND_VALUES_SINGLE: case EXPR_KIND_CYCLE_MARK: + case EXPR_KIND_RPR_DEFINE: /* okay */ break; case EXPR_KIND_CHECK_CONSTRAINT: @@ -3133,6 +3135,8 @@ ParseExprKindName(ParseExprKind exprKind) return "GENERATED AS"; case EXPR_KIND_CYCLE_MARK: return "CYCLE"; + case EXPR_KIND_RPR_DEFINE: + return "DEFINE"; /* * There is intentionally no default: case here, so that the diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c index b3f0b6a137..2ff3699538 100644 --- a/src/backend/parser/parse_func.c +++ b/src/backend/parser/parse_func.c @@ -2656,6 +2656,9 @@ check_srf_call_placement(ParseState *pstate, Node *last_srf, int location) case EXPR_KIND_CYCLE_MARK: errkind = true; break; + case EXPR_KIND_RPR_DEFINE: + errkind = true; + break; /* * There is intentionally no default: case here, so that the -- 2.25.1 ----Next_Part(Mon_Jun_26_17_45_07_2023_724)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="v2-0003-Row-pattern-recognition-patch-planner.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving @ 2026-06-12 12:46 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 249+ messages in thread From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw) Previously we relocated the existing install, for performance reasons. However that has two disadvantages: 1) moving the install and then installing the packages we need is slower than just creating a new install 2) It hardcodes that D: is the fast drive, but that turns out to depend on the type of runner used 3) We were not using any caching and therefore downloaded the same files over and over. We could have added caching in the previous approach too, but it'd have been extra work. I previously prototyped handrolling the install, instead of using msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it doesn't include caching. By the time we add that, the overall complexity seems like it'd be too big. The other alternative would be to generate a downloadable release in the pg-vm-images repo. That'd likely be even faster. Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33 --- .github/workflows/pg-ci.yml | 64 +++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index 442052b72e1..794a2600a23 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -1063,48 +1063,42 @@ jobs: defaults: run: - shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"' + shell: msys2 {0} steps: - *windows_disable_defender_step - *window_setup_hosts_step - *checkout_step - # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to - # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses - # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`. + # The pre-existing msys install is on C:\, often a rather slow system + # disk, whereas the workspace is often on a faster, ephemeral disk. + # Using the pre-existing msys would often increase the total runtime of + # this task by ~15 minutes. # - # This reduces the total runtime of this task by ~15 minutes. - # - # robocopy returns 0-7 on success (with various "files copied" bits - # set) and 8+ on real failure, so we have to translate its exit code. - - name: Relocate MSYS2 to D - shell: pwsh - run: | - robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP - if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE } - exit 0 - - - name: Setup MSYS2 - run: | - # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the - # MSYS2. It dynamically expands to the correct prefix for the active - # shell environment. - pacman -S --noconfirm --needed --asdeps \ - bison flex \ - ${MINGW_PACKAGE_PREFIX}-ccache \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-icu \ - ${MINGW_PACKAGE_PREFIX}-libxml2 \ - ${MINGW_PACKAGE_PREFIX}-libxslt \ - ${MINGW_PACKAGE_PREFIX}-lz4 \ - ${MINGW_PACKAGE_PREFIX}-make \ - ${MINGW_PACKAGE_PREFIX}-meson \ - ${MINGW_PACKAGE_PREFIX}-perl \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-readline \ - ${MINGW_PACKAGE_PREFIX}-zlib \ - ${MINGW_PACKAGE_PREFIX}-zstd + # Instead we use msys2/setup-msys2 to set up our own install. That's + # faster than moving the install from C:\, and also works when the + # workspace is not on a separate disk. + - name: Install MSYS2 + uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1 + with: + msystem: ${{env.MSYSTEM}} + update: true + location: ${{github.workspace}} + install: >- + bison flex + mingw-w64-ucrt-x86_64-ccache + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-icu + mingw-w64-ucrt-x86_64-libxml2 + mingw-w64-ucrt-x86_64-libxslt + mingw-w64-ucrt-x86_64-lz4 + mingw-w64-ucrt-x86_64-make + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-perl + mingw-w64-ucrt-x86_64-pkgconf + mingw-w64-ucrt-x86_64-readline + mingw-w64-ucrt-x86_64-zlib + mingw-w64-ucrt-x86_64-zstd - *nix_sysinfo_step -- 2.54.0.450.g9ac3f193c0 --mr2uqtieh2e2xvha Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch" ^ permalink raw reply [nested|flat] 249+ messages in thread
end of thread, other threads:[~2026-06-12 12:46 UTC | newest] Thread overview: 249+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2023-06-26 08:05 [PATCH v2 2/7] Row pattern recognition patch (parse/analysis). Tatsuo Ishii <ishii@postgresql.org> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de> 2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
This inbox is served by agora; see mirroring instructions for how to clone and mirror all data and code used for this inbox