agora inbox for pgsql-hackers@postgresql.org
help / color / mirror / Atom feed[PATCH v55 1/2] Rename cluster.c/h -> repack.c/h
249+ messages / 2 participants
[nested] [flat]
* [PATCH v55 1/2] Rename cluster.c/h -> repack.c/h
@ 2026-03-31 16:55 Álvaro Herrera <alvherre@kurilemu.de>
0 siblings, 0 replies; 249+ messages in thread
From: Álvaro Herrera @ 2026-03-31 16:55 UTC (permalink / raw)
---
src/backend/commands/Makefile | 2 +-
src/backend/commands/matview.c | 2 +-
src/backend/commands/meson.build | 2 +-
src/backend/commands/{cluster.c => repack.c} | 6 +++---
src/backend/commands/tablecmds.c | 2 +-
src/backend/commands/vacuum.c | 6 +++---
src/backend/storage/ipc/procsignal.c | 1 +
src/backend/tcop/postgres.c | 1 +
src/backend/tcop/utility.c | 2 +-
src/include/commands/{cluster.h => repack.h} | 12 ++++++------
10 files changed, 19 insertions(+), 17 deletions(-)
rename src/backend/commands/{cluster.c => repack.c} (99%)
rename src/include/commands/{cluster.h => repack.h} (90%)
diff --git a/src/backend/commands/Makefile b/src/backend/commands/Makefile
index c10fdba2bbb..fe1bba3a9b9 100644
--- a/src/backend/commands/Makefile
+++ b/src/backend/commands/Makefile
@@ -18,7 +18,6 @@ OBJS = \
amcmds.o \
analyze.o \
async.o \
- cluster.o \
collationcmds.o \
comment.o \
constraint.o \
@@ -51,6 +50,7 @@ OBJS = \
proclang.o \
propgraphcmds.o \
publicationcmds.o \
+ repack.o \
schemacmds.o \
seclabel.o \
sequence.o \
diff --git a/src/backend/commands/matview.c b/src/backend/commands/matview.c
index d3be8939011..5db4fe75dce 100644
--- a/src/backend/commands/matview.c
+++ b/src/backend/commands/matview.c
@@ -24,8 +24,8 @@
#include "catalog/namespace.h"
#include "catalog/pg_am.h"
#include "catalog/pg_opclass.h"
-#include "commands/cluster.h"
#include "commands/matview.h"
+#include "commands/repack.h"
#include "commands/tablecmds.h"
#include "commands/tablespace.h"
#include "executor/executor.h"
diff --git a/src/backend/commands/meson.build b/src/backend/commands/meson.build
index 90c7e37a429..f624aae74af 100644
--- a/src/backend/commands/meson.build
+++ b/src/backend/commands/meson.build
@@ -6,7 +6,6 @@ backend_sources += files(
'amcmds.c',
'analyze.c',
'async.c',
- 'cluster.c',
'collationcmds.c',
'comment.c',
'constraint.c',
@@ -39,6 +38,7 @@ backend_sources += files(
'proclang.c',
'propgraphcmds.c',
'publicationcmds.c',
+ 'repack.c',
'schemacmds.c',
'seclabel.c',
'sequence.c',
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/repack.c
similarity index 99%
rename from src/backend/commands/cluster.c
rename to src/backend/commands/repack.c
index f241e18b153..20f0a572236 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/repack.c
@@ -1,6 +1,6 @@
/*-------------------------------------------------------------------------
*
- * cluster.c
+ * repack.c
* REPACK a table; formerly known as CLUSTER. VACUUM FULL also uses
* parts of this code.
*
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * src/backend/commands/cluster.c
+ * src/backend/commands/repack.c
*
*-------------------------------------------------------------------------
*/
@@ -33,9 +33,9 @@
#include "catalog/pg_am.h"
#include "catalog/pg_inherits.h"
#include "catalog/toasting.h"
-#include "commands/cluster.h"
#include "commands/defrem.h"
#include "commands/progress.h"
+#include "commands/repack.h"
#include "commands/tablecmds.h"
#include "commands/vacuum.h"
#include "miscadmin.h"
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 0ce2e81f9c2..e2882a50b3b 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -57,10 +57,10 @@
#include "catalog/storage.h"
#include "catalog/storage_xlog.h"
#include "catalog/toasting.h"
-#include "commands/cluster.h"
#include "commands/comment.h"
#include "commands/defrem.h"
#include "commands/event_trigger.h"
+#include "commands/repack.h"
#include "commands/sequence.h"
#include "commands/tablecmds.h"
#include "commands/tablespace.h"
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 0ed363d1c85..b179b62b5c8 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -9,7 +9,7 @@
*
* VACUUM for heap AM is implemented in vacuumlazy.c, parallel vacuum in
* vacuumparallel.c, ANALYZE in analyze.c, and VACUUM FULL is a variant of
- * CLUSTER, handled in cluster.c.
+ * REPACK, handled in repack.c.
*
*
* Portions Copyright (c) 1996-2026, PostgreSQL Global Development Group
@@ -38,9 +38,9 @@
#include "catalog/pg_database.h"
#include "catalog/pg_inherits.h"
#include "commands/async.h"
-#include "commands/cluster.h"
#include "commands/defrem.h"
#include "commands/progress.h"
+#include "commands/repack.h"
#include "commands/vacuum.h"
#include "miscadmin.h"
#include "nodes/makefuncs.h"
@@ -2293,7 +2293,7 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams params,
if ((params.options & VACOPT_VERBOSE) != 0)
cluster_params.options |= CLUOPT_VERBOSE;
- /* VACUUM FULL is a variant of REPACK; see cluster.c */
+ /* VACUUM FULL is a variant of REPACK; see repack.c */
cluster_rel(REPACK_COMMAND_VACUUMFULL, rel, InvalidOid,
&cluster_params);
/* cluster_rel closes the relation, but keeps lock */
diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
index f1ab3aa3fe0..02d28df1c6a 100644
--- a/src/backend/storage/ipc/procsignal.c
+++ b/src/backend/storage/ipc/procsignal.c
@@ -19,6 +19,7 @@
#include "access/parallel.h"
#include "commands/async.h"
+#include "commands/repack.h"
#include "miscadmin.h"
#include "pgstat.h"
#include "port/pg_bitutils.h"
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 10be60011ad..9fbaa5c00f0 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -39,6 +39,7 @@
#include "commands/event_trigger.h"
#include "commands/explain_state.h"
#include "commands/prepare.h"
+#include "commands/repack.h"
#include "common/pg_prng.h"
#include "jit/jit.h"
#include "libpq/libpq.h"
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index 2b609bfc824..5f8c766c4be 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -26,7 +26,6 @@
#include "catalog/toasting.h"
#include "commands/alter.h"
#include "commands/async.h"
-#include "commands/cluster.h"
#include "commands/collationcmds.h"
#include "commands/comment.h"
#include "commands/conversioncmds.h"
@@ -46,6 +45,7 @@
#include "commands/proclang.h"
#include "commands/propgraphcmds.h"
#include "commands/publicationcmds.h"
+#include "commands/repack.h"
#include "commands/schemacmds.h"
#include "commands/seclabel.h"
#include "commands/sequence.h"
diff --git a/src/include/commands/cluster.h b/src/include/commands/repack.h
similarity index 90%
rename from src/include/commands/cluster.h
rename to src/include/commands/repack.h
index d6b62c747e8..85061158b0c 100644
--- a/src/include/commands/cluster.h
+++ b/src/include/commands/repack.h
@@ -1,17 +1,17 @@
/*-------------------------------------------------------------------------
*
- * cluster.h
- * header file for postgres cluster command stuff
+ * repack.h
+ * header file for the REPACK command
*
* Portions Copyright (c) 1996-2026, PostgreSQL Global Development Group
* Portions Copyright (c) 1994-5, Regents of the University of California
*
- * src/include/commands/cluster.h
+ * src/include/commands/repack.h
*
*-------------------------------------------------------------------------
*/
-#ifndef CLUSTER_H
-#define CLUSTER_H
+#ifndef REPACK_H
+#define REPACK_H
#include "nodes/parsenodes.h"
#include "parser/parse_node.h"
@@ -52,4 +52,4 @@ extern void finish_heap_swap(Oid OIDOldHeap, Oid OIDNewHeap,
MultiXactId cutoffMulti,
char newrelpersistence);
-#endif /* CLUSTER_H */
+#endif /* REPACK_H */
--
2.47.3
--k3knmf76cw7vbhar
Content-Type: text/x-diff; charset=utf-8
Content-Disposition: attachment;
filename="v55-0002-Add-CONCURRENTLY-option-to-REPACK-command.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
filename="v13a-0005-squash-or-drop-Use-pacboy-for-shorter-package-n.patch"
^ permalink raw reply [nested|flat] 249+ messages in thread
* [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving
@ 2026-06-12 12:46 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 249+ messages in thread
From: Andres Freund @ 2026-06-12 12:46 UTC (permalink / raw)
Previously we relocated the existing install, for performance reasons. However
that has two disadvantages:
1) moving the install and then installing the packages we need is slower than
just creating a new install
2) It hardcodes that D: is the fast drive, but that turns out to depend on the
type of runner used
3) We were not using any caching and therefore downloaded the same files over
and over. We could have added caching in the previous approach too, but
it'd have been extra work.
I previously prototyped handrolling the install, instead of using
msys2/setup-msys2@v2, and that does turn out to be a bit faster, but it
doesn't include caching. By the time we add that, the overall complexity seems
like it'd be too big.
The other alternative would be to generate a downloadable release in the
pg-vm-images repo. That'd likely be even faster.
Discussion: https://postgr.es/m/a2ejn7lfqolutzz7kozalbhy3bixdrujb4buc3pgbtlk4am2ba@wbv6v7riia33
---
.github/workflows/pg-ci.yml | 64 +++++++++++++++++--------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index 442052b72e1..794a2600a23 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -1063,48 +1063,42 @@ jobs:
defaults:
run:
- shell: 'D:\msys64\usr\bin\bash.exe --login -eo pipefail "{0}"'
+ shell: msys2 {0}
steps:
- *windows_disable_defender_step
- *window_setup_hosts_step
- *checkout_step
- # Relocate the preinstalled MSYS2 tree from C:\ (slow system disk) to
- # D:\ (faster ephemeral data disk). Every subsequent MSYS2 step uses
- # D:\msys64\usr\bin\bash.exe via the job's `defaults.run.shell`.
+ # The pre-existing msys install is on C:\, often a rather slow system
+ # disk, whereas the workspace is often on a faster, ephemeral disk.
+ # Using the pre-existing msys would often increase the total runtime of
+ # this task by ~15 minutes.
#
- # This reduces the total runtime of this task by ~15 minutes.
- #
- # robocopy returns 0-7 on success (with various "files copied" bits
- # set) and 8+ on real failure, so we have to translate its exit code.
- - name: Relocate MSYS2 to D
- shell: pwsh
- run: |
- robocopy C:\msys64 D:\msys64 /E /NJS /NJH /NFL /NDL /NP
- if ($LASTEXITCODE -ge 8) { exit $LASTEXITCODE }
- exit 0
-
- - name: Setup MSYS2
- run: |
- # ${MINGW_PACKAGE_PREFIX} is an environment variable used in the
- # MSYS2. It dynamically expands to the correct prefix for the active
- # shell environment.
- pacman -S --noconfirm --needed --asdeps \
- bison flex \
- ${MINGW_PACKAGE_PREFIX}-ccache \
- ${MINGW_PACKAGE_PREFIX}-gcc \
- ${MINGW_PACKAGE_PREFIX}-icu \
- ${MINGW_PACKAGE_PREFIX}-libxml2 \
- ${MINGW_PACKAGE_PREFIX}-libxslt \
- ${MINGW_PACKAGE_PREFIX}-lz4 \
- ${MINGW_PACKAGE_PREFIX}-make \
- ${MINGW_PACKAGE_PREFIX}-meson \
- ${MINGW_PACKAGE_PREFIX}-perl \
- ${MINGW_PACKAGE_PREFIX}-pkgconf \
- ${MINGW_PACKAGE_PREFIX}-readline \
- ${MINGW_PACKAGE_PREFIX}-zlib \
- ${MINGW_PACKAGE_PREFIX}-zstd
+ # Instead we use msys2/setup-msys2 to set up our own install. That's
+ # faster than moving the install from C:\, and also works when the
+ # workspace is not on a separate disk.
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.31.1
+ with:
+ msystem: ${{env.MSYSTEM}}
+ update: true
+ location: ${{github.workspace}}
+ install: >-
+ bison flex
+ mingw-w64-ucrt-x86_64-ccache
+ mingw-w64-ucrt-x86_64-gcc
+ mingw-w64-ucrt-x86_64-icu
+ mingw-w64-ucrt-x86_64-libxml2
+ mingw-w64-ucrt-x86_64-libxslt
+ mingw-w64-ucrt-x86_64-lz4
+ mingw-w64-ucrt-x86_64-make
+ mingw-w64-ucrt-x86_64-meson
+ mingw-w64-ucrt-x86_64-perl
+ mingw-w64-ucrt-x86_64-pkgconf
+ mingw-w64-ucrt-x86_64-readline
+ mingw-w64-ucrt-x86_64-zlib
+ mingw-w64-ucrt-x86_64-zstd
- *nix_sysinfo_step
--
2.54.0.450.g9ac3f193c0
--mr2uqtieh2e2xvha
Content-Type: text/x-diff; charset=us-ascii
Content-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-03-31 16:55 [PATCH v55 1/2] Rename cluster.c/h -> repack.c/h Álvaro Herrera <alvherre@kurilemu.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-06-12 12:46 [PATCH v13a 4/9] ci: Make our own msys2 install from scratch, instead of moving Andres Freund <andres@anarazel.de>
2026-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