agora inbox for pgsql-hackers@postgresql.orghelp / color / mirror / Atom feed
[PATCH 2/5] Refactor index_concurrently_create_copy() for use with REPACK (CONCURRENTLY). 249+ messages / 2 participants [nested] [flat]
* [PATCH 2/5] Refactor index_concurrently_create_copy() for use with REPACK (CONCURRENTLY). @ 2026-02-27 18:01 Antonin Houska <ah@cybertec.at> 0 siblings, 0 replies; 249+ messages in thread From: Antonin Houska @ 2026-02-27 18:01 UTC (permalink / raw) This patch moves the code to index_create_copy() and adds a "concurrently" parameter so it can be used by REPACK (CONCURRENTLY). With the CONCURRENTLY option, REPACK cannot simply swap the heap file and rebuild its indexes. Instead, it needs to build a separate set of indexes (including system catalog entries) *before* the actual swap, to reduce the time AccessExclusiveLock needs to be held for. --- src/backend/catalog/index.c | 54 +++++++++++++++++++++++--------- src/backend/commands/indexcmds.c | 6 ++-- src/backend/nodes/makefuncs.c | 9 +++--- src/include/catalog/index.h | 3 ++ src/include/nodes/makefuncs.h | 4 ++- 5 files changed, 54 insertions(+), 22 deletions(-) diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index 5ee6389d39c..f8e6c3d804e 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -1288,15 +1288,32 @@ index_create(Relation heapRelation, /* * index_concurrently_create_copy * - * Create concurrently an index based on the definition of the one provided by - * caller. The index is inserted into catalogs and needs to be built later - * on. This is called during concurrent reindex processing. - * - * "tablespaceOid" is the tablespace to use for this index. + * Variant of index_create_copy(), called during concurrent reindex + * processing. */ Oid index_concurrently_create_copy(Relation heapRelation, Oid oldIndexId, Oid tablespaceOid, const char *newName) +{ + return index_create_copy(heapRelation, oldIndexId, tablespaceOid, newName, + true); +} + +/* + * index_create_copy + * + * Create an index based on the definition of the one provided by caller. The + * index is inserted into catalogs. If 'concurrently' is TRUE, it needs to be + * built later on, otherwise it's built immediately. + * + * "tablespaceOid" is the tablespace to use for this index. + * + * The actual implementation of index_concurrently_create_copy(), reusable for + * other purposes. + */ +Oid +index_create_copy(Relation heapRelation, Oid oldIndexId, Oid tablespaceOid, + const char *newName, bool concurrently) { Relation indexRelation; IndexInfo *oldInfo, @@ -1315,6 +1332,7 @@ index_concurrently_create_copy(Relation heapRelation, Oid oldIndexId, List *indexColNames = NIL; List *indexExprs = NIL; List *indexPreds = NIL; + int flags = 0; indexRelation = index_open(oldIndexId, RowExclusiveLock); @@ -1325,7 +1343,7 @@ index_concurrently_create_copy(Relation heapRelation, Oid oldIndexId, * Concurrent build of an index with exclusion constraints is not * supported. */ - if (oldInfo->ii_ExclusionOps != NULL) + if (oldInfo->ii_ExclusionOps != NULL && concurrently) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("concurrent index creation for exclusion constraints is not supported"))); @@ -1381,9 +1399,7 @@ index_concurrently_create_copy(Relation heapRelation, Oid oldIndexId, } /* - * Build the index information for the new index. Note that rebuild of - * indexes with exclusion constraints is not supported, hence there is no - * need to fill all the ii_Exclusion* fields. + * Build the index information for the new index. */ newInfo = makeIndexInfo(oldInfo->ii_NumIndexAttrs, oldInfo->ii_NumIndexKeyAttrs, @@ -1392,10 +1408,13 @@ index_concurrently_create_copy(Relation heapRelation, Oid oldIndexId, indexPreds, oldInfo->ii_Unique, oldInfo->ii_NullsNotDistinct, - false, /* not ready for inserts */ - true, + !concurrently, /* isready */ + concurrently, /* concurrent */ indexRelation->rd_indam->amsummarizing, - oldInfo->ii_WithoutOverlaps); + oldInfo->ii_WithoutOverlaps, + oldInfo->ii_ExclusionOps, + oldInfo->ii_ExclusionProcs, + oldInfo->ii_ExclusionStrats); /* * Extract the list of column names and the column numbers for the new @@ -1433,6 +1452,9 @@ index_concurrently_create_copy(Relation heapRelation, Oid oldIndexId, stattargets[i].isnull = isnull; } + if (concurrently) + flags = INDEX_CREATE_SKIP_BUILD | INDEX_CREATE_CONCURRENT; + /* * Now create the new index. * @@ -1456,7 +1478,7 @@ index_concurrently_create_copy(Relation heapRelation, Oid oldIndexId, indcoloptions->values, stattargets, reloptionsDatum, - INDEX_CREATE_SKIP_BUILD | INDEX_CREATE_CONCURRENT, + flags, 0, true, /* allow table to be a system catalog? */ false, /* is_internal? */ @@ -2450,7 +2472,8 @@ BuildIndexInfo(Relation index) indexStruct->indisready, false, index->rd_indam->amsummarizing, - indexStruct->indisexclusion && indexStruct->indisunique); + indexStruct->indisexclusion && indexStruct->indisunique, + NULL, NULL, NULL); /* fill in attribute numbers */ for (i = 0; i < numAtts; i++) @@ -2510,7 +2533,8 @@ BuildDummyIndexInfo(Relation index) indexStruct->indisready, false, index->rd_indam->amsummarizing, - indexStruct->indisexclusion && indexStruct->indisunique); + indexStruct->indisexclusion && indexStruct->indisunique, + NULL, NULL, NULL); /* fill in attribute numbers */ for (i = 0; i < numAtts; i++) diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index 635679cc1f2..34209bd1393 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -243,7 +243,8 @@ CheckIndexCompatible(Oid oldId, */ indexInfo = makeIndexInfo(numberOfAttributes, numberOfAttributes, accessMethodId, NIL, NIL, false, false, - false, false, amsummarizing, isWithoutOverlaps); + false, false, amsummarizing, isWithoutOverlaps, + NULL, NULL, NULL); typeIds = palloc_array(Oid, numberOfAttributes); collationIds = palloc_array(Oid, numberOfAttributes); opclassIds = palloc_array(Oid, numberOfAttributes); @@ -930,7 +931,8 @@ DefineIndex(ParseState *pstate, !concurrent, concurrent, amissummarizing, - stmt->iswithoutoverlaps); + stmt->iswithoutoverlaps, + NULL, NULL, NULL); typeIds = palloc_array(Oid, numberOfAttributes); collationIds = palloc_array(Oid, numberOfAttributes); diff --git a/src/backend/nodes/makefuncs.c b/src/backend/nodes/makefuncs.c index 2caec621d73..ca7e21e8349 100644 --- a/src/backend/nodes/makefuncs.c +++ b/src/backend/nodes/makefuncs.c @@ -834,7 +834,8 @@ IndexInfo * makeIndexInfo(int numattrs, int numkeyattrs, Oid amoid, List *expressions, List *predicates, bool unique, bool nulls_not_distinct, bool isready, bool concurrent, bool summarizing, - bool withoutoverlaps) + bool withoutoverlaps, Oid *exclusion_ops, Oid *exclusion_procs, + uint16 *exclusion_strats) { IndexInfo *n = makeNode(IndexInfo); @@ -863,9 +864,9 @@ makeIndexInfo(int numattrs, int numkeyattrs, Oid amoid, List *expressions, n->ii_PredicateState = NULL; /* exclusion constraints */ - n->ii_ExclusionOps = NULL; - n->ii_ExclusionProcs = NULL; - n->ii_ExclusionStrats = NULL; + n->ii_ExclusionOps = exclusion_ops; + n->ii_ExclusionProcs = exclusion_procs; + n->ii_ExclusionStrats = exclusion_strats; /* speculative inserts */ n->ii_UniqueOps = NULL; diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h index b259c4141ed..3426087b445 100644 --- a/src/include/catalog/index.h +++ b/src/include/catalog/index.h @@ -99,6 +99,9 @@ extern Oid index_concurrently_create_copy(Relation heapRelation, Oid oldIndexId, Oid tablespaceOid, const char *newName); +extern Oid index_create_copy(Relation heapRelation, Oid oldIndexId, + Oid tablespaceOid, const char *newName, + bool concurrently); extern void index_concurrently_build(Oid heapRelationId, Oid indexRelationId); diff --git a/src/include/nodes/makefuncs.h b/src/include/nodes/makefuncs.h index 982ec25ae14..dcea148ae1a 100644 --- a/src/include/nodes/makefuncs.h +++ b/src/include/nodes/makefuncs.h @@ -99,7 +99,9 @@ extern IndexInfo *makeIndexInfo(int numattrs, int numkeyattrs, Oid amoid, List *expressions, List *predicates, bool unique, bool nulls_not_distinct, bool isready, bool concurrent, - bool summarizing, bool withoutoverlaps); + bool summarizing, bool withoutoverlaps, + Oid *exclusion_ops, Oid *exclusion_procs, + uint16 *exclusion_strats); extern Node *makeStringConst(char *str, int location); extern DefElem *makeDefElem(char *name, Node *arg, int location); -- 2.47.3 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=v36-0003-Move-conversion-of-a-historic-to-MVCC-snapshot-to-a-.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 -- 2026-02-27 18:01 [PATCH 2/5] Refactor index_concurrently_create_copy() for use with REPACK (CONCURRENTLY). Antonin Houska <ah@cybertec.at> 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