<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/f40738435eadc4bf4c4d6ddf2db26c29d2585657">https://github.com/macports/macports-ports/commit/f40738435eadc4bf4c4d6ddf2db26c29d2585657</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 f40738435ea CI: report more info about bootstrap downloads
</span>f40738435ea is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f40738435eadc4bf4c4d6ddf2db26c29d2585657
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Feb 7 22:31:42 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> CI: report more info about bootstrap downloads
</span>---
.github/workflows/bootstrap.sh | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 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 f304835b6cb..76f94244e54 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;'>@@ -39,8 +39,9 @@ curl_getopt_pid=$!
</span> echo "Fetching MacPorts..."
/usr/bin/curl -fsSLO "https://github.com/macports/macports-ci-files/releases/download/v${MACPORTS_VERSION}/${MACPORTS_FILENAME}" &
curl_mpbase_pid=$!
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Fetching PortIndex..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/usr/bin/curl -fsSLo ports/PortIndex "https://ftp.fau.de/macports/release/ports/PortIndex_darwin_${OS_MAJOR}_${OS_ARCH}/PortIndex" &
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PORTINDEX_URL="https://ftp.fau.de/macports/release/ports/PortIndex_darwin_${OS_MAJOR}_${OS_ARCH}/PortIndex"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+echo "Fetching PortIndex from $PORTINDEX_URL ..."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/usr/bin/curl -fsSLo ports/PortIndex "$PORTINDEX_URL" &
</span> curl_portindex_pid=$!
endgroup
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,7 +77,9 @@ endgroup
</span>
begingroup "Installing getopt"
# Install getopt required by mpbb
<span style='display:block; white-space:pre;background:#ffe0e0;'>-wait $curl_getopt_pid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if ! wait $curl_getopt_pid; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Fetching getopt failed: $?"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fi
</span> echo "Extracting..."
sudo tar -xpf "getopt-v1.1.6.tar.bz2" -C /
rm -f "getopt-v1.1.6.tar.bz2"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,7 +88,9 @@ endgroup
</span>
begingroup "Installing MacPorts"
# Install MacPorts built by https://github.com/macports/macports-base/tree/master/.github
<span style='display:block; white-space:pre;background:#ffe0e0;'>-wait $curl_mpbase_pid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if ! wait $curl_mpbase_pid; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Fetching base failed: $?"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fi
</span> echo "Extracting..."
sudo tar -xpf "${MACPORTS_FILENAME}" -C /
rm -f "${MACPORTS_FILENAME}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,7 +123,9 @@ git -C ports/ checkout -qf macports/master~10
</span> git -C ports/ checkout -qf -
git -C ports/ checkout -qf "$(git -C ports/ merge-base macports/master HEAD)"
## Ignore portindex errors on common ancestor
<span style='display:block; white-space:pre;background:#ffe0e0;'>-wait $curl_portindex_pid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if ! wait $curl_portindex_pid; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Fetching PortIndex failed: $?"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fi
</span> (cd ports/ && portindex)
git -C ports/ checkout -qf -
(cd ports/ && portindex -e)
</pre><pre style='margin:0'>
</pre>