<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/5d9a6925039cb33c7a5a8a33cd73e4c14010d6f0">https://github.com/macports/macports-ports/commit/5d9a6925039cb33c7a5a8a33cd73e4c14010d6f0</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 5d9a6925039 Start fetching portindex earlier in CI bootstrap
</span>5d9a6925039 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5d9a6925039cb33c7a5a8a33cd73e4c14010d6f0
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Apr 28 13:59:56 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> Start fetching portindex earlier in CI bootstrap
</span>---
.github/azure-workflows/bootstrap.sh | 9 +++++----
.github/workflows/bootstrap.sh | 9 +++++----
2 files changed, 10 insertions(+), 8 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 bec66e5cdcf..d5420ad1a74 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,6 +20,9 @@ curl_getopt_pid=$!
</span> echo "Fetching MacPorts..."
/usr/bin/curl -fsSLO "https://distfiles.macports.org/_ci/macports-base/MacPorts-${OS_MAJOR}.tar.bz2" &
curl_mpbase_pid=$!
<span style='display:block; white-space:pre;background:#e0ffe0;'>+echo "Fetching PortIndex..."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/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;'>+curl_portindex_pid=$!
</span> echo "##[endgroup]"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,9 +89,7 @@ echo "archive_site_local https://packages-private.macports.org/:tbz2" | sudo tee
</span> echo "##[endgroup]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "##[group]Generating PortIndex"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Update PortIndex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-curl -L "https://ftp.fau.de/macports/release/ports/PortIndex_darwin_${OS_MAJOR}_${OS_ARCH}/PortIndex" -o ports/PortIndex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+echo "##[group]Updating PortIndex"
</span> ## Run portindex on recent commits if PR is newer
git -C ports/ remote add macports https://github.com/macports/macports-ports.git
git -C ports/ fetch macports master
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,6 +97,7 @@ 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:#e0ffe0;'>+wait $curl_portindex_pid
</span> (cd ports/ && portindex)
git -C ports/ checkout -qf -
(cd ports/ && portindex -e)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,6 +106,5 @@ echo "##[endgroup]"
</span>
echo "##[group]Running postflight"
# Create macports user
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Postflight..."
</span> sudo /opt/local/libexec/macports/postflight/postflight
echo "##[endgroup]"
<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 26e76c715a1..71697c61a46 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,6 +20,9 @@ curl_getopt_pid=$!
</span> echo "Fetching MacPorts..."
/usr/bin/curl -fsSLO "https://distfiles.macports.org/_ci/macports-base/MacPorts-${OS_MAJOR}.tar.bz2" &
curl_mpbase_pid=$!
<span style='display:block; white-space:pre;background:#e0ffe0;'>+echo "Fetching PortIndex..."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/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;'>+curl_portindex_pid=$!
</span> echo "::endgroup::"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,9 +89,7 @@ echo "archive_site_local https://packages-private.macports.org/:tbz2" | sudo tee
</span> echo "::endgroup::"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "::group::Generating PortIndex"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Update PortIndex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-curl -L "https://ftp.fau.de/macports/release/ports/PortIndex_darwin_${OS_MAJOR}_${OS_ARCH}/PortIndex" -o ports/PortIndex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+echo "::group::Updating PortIndex"
</span> ## Run portindex on recent commits if PR is newer
git -C ports/ remote add macports https://github.com/macports/macports-ports.git
git -C ports/ fetch macports master
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,6 +97,7 @@ 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:#e0ffe0;'>+wait $curl_portindex_pid
</span> (cd ports/ && portindex)
git -C ports/ checkout -qf -
(cd ports/ && portindex -e)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,6 +106,5 @@ echo "::endgroup::"
</span>
echo "::group::Running postflight"
# Create macports user
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Postflight..."
</span> sudo /opt/local/libexec/macports/postflight/postflight
echo "::endgroup::"
</pre><pre style='margin:0'>
</pre>