agora inbox for pgsql-hackers@postgresql.org
help / color / mirror / Atom feed[PATCH v12a 3/3] ci: macports improvements
446+ messages / 2 participants
[nested] [flat]
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements
@ 2026-06-04 14:17 Andres Freund <andres@anarazel.de>
0 siblings, 0 replies; 446+ messages in thread
From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw)
I realized two things:
1) We should save the macports cache before building & running tests, we don't
want to again start from scratch if the task failed or was cancelled
2) We should use a partial cache match, as it's much faster to start from
that, than from scratch.
This requires some additional complexity, we now need an explicit restore step
and need to check if the install step succeeded. But it's a very substantial
improvement in runtime, so it's worthwhile.
---
.github/workflows/pg-ci.yml | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml
index dea8d95d729..dd4ff4c91d3 100644
--- a/.github/workflows/pg-ci.yml
+++ b/.github/workflows/pg-ci.yml
@@ -690,18 +690,23 @@ jobs:
sudo sysctl kern.corefile="$HOME/cores/core.%P"
- name: "Macports: Compute cache key"
- id: mpkey
+ id: mp-key
run: |
macos_major=$(sw_vers -productVersion | sed 's/\..*//')
pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q)
script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh)
echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT"
+ # It's faster to start with a partial cache for the same macos
+ # version than from scratch
+ echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT"
- name: "MacPorts: Restore cache"
- uses: actions/cache@v5
+ id: mp-restore
+ uses: actions/cache/restore@v5
with:
path: ${{ env.MACPORTS_CACHE }}
- key: ${{ steps.mpkey.outputs.key }}
+ key: ${{ steps.mp-key.outputs.key }}
+ restore-keys: ${{ steps.mp-key.outputs.restore-key }}
# Use MacPorts, even though Homebrew is installed. The installation
# of the additional packages we need would take quite a while with
@@ -714,6 +719,7 @@ jobs:
# actually p5.34-io-tty. Using the unversioned name works, but
# updates MacPorts every time.
- name: "MacPorts: Install dependencies"
+ id: mp-install
env:
# Pass token so the script's GitHub API call to list MacPorts
# releases isn't subject to the 60/h/IP unauthenticated rate
@@ -727,6 +733,18 @@ jobs:
echo /opt/local/sbin >> "$GITHUB_PATH"
echo /opt/local/bin >> "$GITHUB_PATH"
+ # Save macports before running build / tests, creating macports can be
+ # quite slow, so we don't want to start from scratch in the next run.
+ - name: "MacPorts: Save cache"
+ uses: actions/cache/save@v5
+ # Don't save cache if we had an exact match
+ if: |
+ steps.mp-install.conclusion == 'success' &&
+ steps.mp-restore.outputs.cache-hit != 'true'
+ with:
+ path: ${{ env.MACPORTS_CACHE }}
+ key: ${{ steps.mp-key.outputs.key }}
+
- name: Configure
env:
PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/
--
2.54.0.380.gc69baaf57b
--ijwec7zgt2lxep65--
^ permalink raw reply [nested|flat] 446+ messages in thread
* [PATCH v1 5/8] convert Sharedsort->{currentWorker,workersFinished} to atomics
@ 2026-07-09 20:04 Nathan Bossart <nathan@postgresql.org>
0 siblings, 0 replies; 446+ messages in thread
From: Nathan Bossart @ 2026-07-09 20:04 UTC (permalink / raw)
---
src/backend/utils/sort/tuplesort.c | 30 ++++++++----------------------
1 file changed, 8 insertions(+), 22 deletions(-)
diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c
index c0e7527b9ca..81e0b2816d6 100644
--- a/src/backend/utils/sort/tuplesort.c
+++ b/src/backend/utils/sort/tuplesort.c
@@ -104,6 +104,7 @@
#include "commands/tablespace.h"
#include "miscadmin.h"
#include "pg_trace.h"
+#include "port/atomics.h"
#include "port/pg_bitutils.h"
#include "storage/shmem.h"
#include "utils/guc.h"
@@ -340,9 +341,6 @@ struct Tuplesortstate
*/
struct Sharedsort
{
- /* mutex protects all fields prior to tapes */
- slock_t mutex;
-
/*
* currentWorker generates ordinal identifier numbers for parallel sort
* workers. These start from 0, and are always gapless.
@@ -351,8 +349,8 @@ struct Sharedsort
* is equal to state.nParticipants within the leader, leader is ready to
* merge worker runs.
*/
- int currentWorker;
- int workersFinished;
+ pg_atomic_uint32 currentWorker;
+ pg_atomic_uint32 workersFinished;
/* Temporary file space */
SharedFileSet fileset;
@@ -3252,9 +3250,8 @@ tuplesort_initialize_shared(Sharedsort *shared, int nWorkers, dsm_segment *seg)
Assert(nWorkers > 0);
- SpinLockInit(&shared->mutex);
- shared->currentWorker = 0;
- shared->workersFinished = 0;
+ pg_atomic_init_u32(&shared->currentWorker, 0);
+ pg_atomic_init_u32(&shared->workersFinished, 0);
SharedFileSetInit(&shared->fileset, seg);
shared->nTapes = nWorkers;
for (i = 0; i < nWorkers; i++)
@@ -3291,16 +3288,9 @@ tuplesort_attach_shared(Sharedsort *shared, dsm_segment *seg)
static int
worker_get_identifier(Tuplesortstate *state)
{
- Sharedsort *shared = state->shared;
- int worker;
-
Assert(WORKER(state));
- SpinLockAcquire(&shared->mutex);
- worker = shared->currentWorker++;
- SpinLockRelease(&shared->mutex);
-
- return worker;
+ return pg_atomic_fetch_add_u32(&state->shared->currentWorker, 1);
}
/*
@@ -3342,10 +3332,8 @@ worker_freeze_result_tape(Tuplesortstate *state)
LogicalTapeFreeze(state->result_tape, &output);
/* Store properties of output tape, and update finished worker count */
- SpinLockAcquire(&shared->mutex);
shared->tapes[state->worker] = output;
- shared->workersFinished++;
- SpinLockRelease(&shared->mutex);
+ pg_atomic_fetch_add_u32(&shared->workersFinished, 1);
}
/*
@@ -3387,9 +3375,7 @@ leader_takeover_tapes(Tuplesortstate *state)
Assert(LEADER(state));
Assert(nParticipants >= 1);
- SpinLockAcquire(&shared->mutex);
- workersFinished = shared->workersFinished;
- SpinLockRelease(&shared->mutex);
+ workersFinished = pg_atomic_read_membarrier_u32(&shared->workersFinished);
if (nParticipants != workersFinished)
elog(ERROR, "cannot take over tapes before all workers finish");
--
2.50.1 (Apple Git-155)
--Ot5x3ffkWEuxilWO
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
filename=v1-0006-convert-SharedFileSet-refcnt-to-an-atomic.patch
^ permalink raw reply [nested|flat] 446+ messages in thread
end of thread, other threads:[~2026-07-09 20:04 UTC | newest]
Thread overview: 446+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
2026-07-09 20:04 [PATCH v1 5/8] convert Sharedsort->{currentWorker,workersFinished} to atomics Nathan Bossart <nathan@postgresql.org>
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox