<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9c8aae76a2cae6e9484fc4d5c6522895200609e1">https://github.com/macports/macports-ports/commit/9c8aae76a2cae6e9484fc4d5c6522895200609e1</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 9c8aae76a2c Install getopt before MacPorts in CI bootstrap
</span>9c8aae76a2c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9c8aae76a2cae6e9484fc4d5c6522895200609e1
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Apr 27 15:28:52 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> Install getopt before MacPorts in CI bootstrap
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> getopt is tiny and will finish downloading first.
</span>---
.github/azure-workflows/bootstrap.sh | 23 ++++++++++++-----------
.github/workflows/bootstrap.sh | 23 ++++++++++++-----------
2 files changed, 24 insertions(+), 22 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/.github/azure-workflows/bootstrap.sh b/.github/azure-workflows/bootstrap.sh
</span><span style='display:block; white-space:pre;color:#808080;'>index 7b290a43027..513d529e653 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/.github/azure-workflows/bootstrap.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/.github/azure-workflows/bootstrap.sh
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,12 +20,12 @@ echo "##[endgroup]"
</span> echo "##[group]Fetching files"
# Download resources in background ASAP but use later.
# Use /usr/bin/curl so that we don't use Homebrew curl.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Fetching MacPorts..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/usr/bin/curl -fsSLO "https://distfiles.macports.org/_ci/macports-base/MacPorts-${OS_MAJOR}.tar.bz2" &
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-curl_mpbase_pid=$!
</span> echo "Fetching getopt..."
/usr/bin/curl -fsSLO "https://distfiles.macports.org/_ci/getopt/getopt-v1.1.6.tar.bz2" &
curl_getopt_pid=$!
<span style='display:block; white-space:pre;background:#e0ffe0;'>+echo "Fetching MacPorts..."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/usr/bin/curl -fsSLO "https://distfiles.macports.org/_ci/macports-base/MacPorts-${OS_MAJOR}.tar.bz2" &
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+curl_mpbase_pid=$!
</span> echo "##[endgroup]"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,6 +50,15 @@ hash -r
</span> echo "##[endgroup]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+echo "##[group]Installing getopt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Install getopt required by mpbb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+wait $curl_getopt_pid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+echo "Extracting..."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+sudo tar -xpf "getopt-v1.1.6.tar.bz2" -C /
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+rm -f "getopt-v1.1.6.tar.bz2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+echo "##[endgroup]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> echo "##[group]Installing MacPorts"
# Install MacPorts built by https://github.com/macports/macports-base/tree/master/.github
wait $curl_mpbase_pid
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,11 +107,3 @@ echo "##[group]Running postflight"
</span> echo "Postflight..."
sudo /opt/local/libexec/macports/postflight/postflight
echo "##[endgroup]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "##[group]Installing getopt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Install getopt required by mpbb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-wait $curl_getopt_pid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Extracting..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-sudo tar -xpf "getopt-v1.1.6.tar.bz2" -C /
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "##[endgroup]"
</span><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 439feea89b7..6f663e36356 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;'>@@ -20,12 +20,12 @@ echo "::endgroup::"
</span> echo "::group::Fetching files"
# Download resources in background ASAP but use later.
# Use /usr/bin/curl so that we don't use Homebrew curl.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Fetching MacPorts..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/usr/bin/curl -fsSLO "https://distfiles.macports.org/_ci/macports-base/MacPorts-${OS_MAJOR}.tar.bz2" &
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-curl_mpbase_pid=$!
</span> echo "Fetching getopt..."
/usr/bin/curl -fsSLO "https://distfiles.macports.org/_ci/getopt/getopt-v1.1.6.tar.bz2" &
curl_getopt_pid=$!
<span style='display:block; white-space:pre;background:#e0ffe0;'>+echo "Fetching MacPorts..."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/usr/bin/curl -fsSLO "https://distfiles.macports.org/_ci/macports-base/MacPorts-${OS_MAJOR}.tar.bz2" &
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+curl_mpbase_pid=$!
</span> echo "::endgroup::"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,6 +50,15 @@ hash -r
</span> echo "::endgroup::"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+echo "::group::Installing getopt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Install getopt required by mpbb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+wait $curl_getopt_pid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+echo "Extracting..."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+sudo tar -xpf "getopt-v1.1.6.tar.bz2" -C /
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+rm -f "getopt-v1.1.6.tar.bz2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+echo "::endgroup::"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> echo "::group::Installing MacPorts"
# Install MacPorts built by https://github.com/macports/macports-base/tree/master/.github
wait $curl_mpbase_pid
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,11 +107,3 @@ echo "::group::Running postflight"
</span> echo "Postflight..."
sudo /opt/local/libexec/macports/postflight/postflight
echo "::endgroup::"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "::group::Installing getopt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Install getopt required by mpbb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-wait $curl_getopt_pid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Extracting..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-sudo tar -xpf "getopt-v1.1.6.tar.bz2" -C /
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "::endgroup::"
</span></pre><pre style='margin:0'>
</pre>