<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/030949787e2a54e1543e689d5ce8ecfbd397bda5">https://github.com/macports/macports-ports/commit/030949787e2a54e1543e689d5ce8ecfbd397bda5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 030949787e2 Use MacPorts 2.8.0 for CI
</span>030949787e2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 030949787e2a54e1543e689d5ce8ecfbd397bda5
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Oct 21 13:03:33 2022 +1100
<span style='display:block; white-space:pre;color:#404040;'> Use MacPorts 2.8.0 for CI
</span>---
.github/workflows/bootstrap.sh | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/.github/workflows/bootstrap.sh b/.github/workflows/bootstrap.sh
</span><span style='display:block; white-space:pre;color:#808080;'>index 6720ae81883..2562714c68d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/.github/workflows/bootstrap.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/.github/workflows/bootstrap.sh
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,7 @@ endgroup() {
</span> printtag "endgroup"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-MACPORTS_VERSION=2.7.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MACPORTS_VERSION=2.8.0
</span>
OS_MAJOR=$(uname -r | cut -f 1 -d .)
OS_ARCH=$(uname -m)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +25,7 @@ case "$OS_ARCH" in
</span> ;;
esac
<span style='display:block; white-space:pre;background:#e0ffe0;'>+MACPORTS_FILENAME=MacPorts-${MACPORTS_VERSION}-${OS_MAJOR}.tar.bz2
</span>
begingroup "Fetching files"
# Download resources in background ASAP but use later.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +34,7 @@ echo "Fetching getopt..."
</span> /usr/bin/curl -fsSLO "https://distfiles.macports.org/_ci/getopt/getopt-v1.1.6.tar.bz2" &
curl_getopt_pid=$!
echo "Fetching MacPorts..."
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/usr/bin/curl -fsSLO "https://github.com/macports/macports-ci-files/releases/download/v${MACPORTS_VERSION}/MacPorts-${OS_MAJOR}.tar.bz2" &
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/usr/bin/curl -fsSLO "https://github.com/macports/macports-ci-files/releases/download/v${MACPORTS_VERSION}/${MACPORTS_FILENAME}" &
</span> curl_mpbase_pid=$!
echo "Fetching PortIndex..."
/usr/bin/curl -fsSLo ports/PortIndex "https://ftp.fau.de/macports/release/ports/PortIndex_darwin_${OS_MAJOR}_${OS_ARCH}/PortIndex" &
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,8 +84,8 @@ begingroup "Installing MacPorts"
</span> # Install MacPorts built by https://github.com/macports/macports-base/tree/master/.github
wait $curl_mpbase_pid
echo "Extracting..."
<span style='display:block; white-space:pre;background:#ffe0e0;'>-sudo tar -xpf "MacPorts-${OS_MAJOR}.tar.bz2" -C /
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-rm -f "MacPorts-${OS_MAJOR}.tar.bz2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+sudo tar -xpf "${MACPORTS_FILENAME}" -C /
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+rm -f "${MACPORTS_FILENAME}"
</span> endgroup
</pre><pre style='margin:0'>
</pre>