agora inbox for pgsql-hackers@postgresql.orghelp / color / mirror / Atom feed
[PATCH v6a 5/5] gha: Only run main regression tests 458+ messages / 1 participants [nested] [flat]
* [PATCH v6a 5/5] gha: Only run main regression tests @ 2026-06-01 19:31 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-01 19:31 UTC (permalink / raw) --- .github/workflows/postgresql-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/postgresql-ci.yml b/.github/workflows/postgresql-ci.yml index e2795ca0ffb..c6d4c960a55 100644 --- a/.github/workflows/postgresql-ci.yml +++ b/.github/workflows/postgresql-ci.yml @@ -35,7 +35,8 @@ env: # Check target for the autoconf builds. Can be set to e.g. check to only # only test the main regression tests. - CHECK: check-world PROVE_FLAGS=--timer + # FIXME: Reset + CHECK: check PROVE_FLAGS=--timer CHECKFLAGS: -Otarget # Build test dependencies as part of the build step, to see compiler @@ -45,7 +46,8 @@ env: # Can be set to a non-empty value to run a limited set of tests # (e.g. --suite regress to only run the main regression tests). - MTEST_TARGET: + # FIXME: Reset + MTEST_TARGET: --suite regress PGCTLTIMEOUT: 120 # avoids spurious failures during parallel tests TEMP_CONFIG: ${{ github.workspace }}/src/tools/ci/pg_ci_base.conf -- 2.54.0.380.gc69baaf57b --rv3g7aw7ud36z5b5-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
* [PATCH v12a 3/3] ci: macports improvements @ 2026-06-04 14:17 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 458+ messages in thread From: Andres Freund @ 2026-06-04 14:17 UTC (permalink / raw) I realized two things: 1) We should save the macports cache before building & running tests, we don't want to again start from scratch if the task failed or was cancelled 2) We should use a partial cache match, as it's much faster to start from that, than from scratch. This requires some additional complexity, we now need an explicit restore step and need to check if the install step succeeded. But it's a very substantial improvement in runtime, so it's worthwhile. --- .github/workflows/pg-ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pg-ci.yml b/.github/workflows/pg-ci.yml index dea8d95d729..dd4ff4c91d3 100644 --- a/.github/workflows/pg-ci.yml +++ b/.github/workflows/pg-ci.yml @@ -690,18 +690,23 @@ jobs: sudo sysctl kern.corefile="$HOME/cores/core.%P" - name: "Macports: Compute cache key" - id: mpkey + id: mp-key run: | macos_major=$(sw_vers -productVersion | sed 's/\..*//') pkglist_hash=$(printf '%s' "$MACOS_PACKAGE_LIST" | md5 -q) script_hash=$(md5 -q src/tools/ci/ci_macports_packages.sh) echo "key=macports-${macos_major}-${pkglist_hash}-${script_hash}" >> "$GITHUB_OUTPUT" + # It's faster to start with a partial cache for the same macos + # version than from scratch + echo "restore-key=macports-${macos_major}-" >> "$GITHUB_OUTPUT" - name: "MacPorts: Restore cache" - uses: actions/cache@v5 + id: mp-restore + uses: actions/cache/restore@v5 with: path: ${{ env.MACPORTS_CACHE }} - key: ${{ steps.mpkey.outputs.key }} + key: ${{ steps.mp-key.outputs.key }} + restore-keys: ${{ steps.mp-key.outputs.restore-key }} # Use MacPorts, even though Homebrew is installed. The installation # of the additional packages we need would take quite a while with @@ -714,6 +719,7 @@ jobs: # actually p5.34-io-tty. Using the unversioned name works, but # updates MacPorts every time. - name: "MacPorts: Install dependencies" + id: mp-install env: # Pass token so the script's GitHub API call to list MacPorts # releases isn't subject to the 60/h/IP unauthenticated rate @@ -727,6 +733,18 @@ jobs: echo /opt/local/sbin >> "$GITHUB_PATH" echo /opt/local/bin >> "$GITHUB_PATH" + # Save macports before running build / tests, creating macports can be + # quite slow, so we don't want to start from scratch in the next run. + - name: "MacPorts: Save cache" + uses: actions/cache/save@v5 + # Don't save cache if we had an exact match + if: | + steps.mp-install.conclusion == 'success' && + steps.mp-restore.outputs.cache-hit != 'true' + with: + path: ${{ env.MACPORTS_CACHE }} + key: ${{ steps.mp-key.outputs.key }} + - name: Configure env: PKG_CONFIG_PATH: /opt/local/lib/pkgconfig/ -- 2.54.0.380.gc69baaf57b --ijwec7zgt2lxep65-- ^ permalink raw reply [nested|flat] 458+ messages in thread
end of thread, other threads:[~2026-06-04 14:17 UTC | newest] Thread overview: 458+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2026-06-01 19:31 [PATCH v6a 5/5] gha: Only run main regression tests Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de> 2026-06-04 14:17 [PATCH v12a 3/3] ci: macports improvements Andres Freund <andres@anarazel.de>
This inbox is served by agora; see mirroring instructions for how to clone and mirror all data and code used for this inbox