<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/528b4ca6ab54cd5f2cee1bcaa77a4c0402ec9d31">https://github.com/macports/macports-ports/commit/528b4ca6ab54cd5f2cee1bcaa77a4c0402ec9d31</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 528b4ca6ab5 Abstract differences between bootstrap scripts
</span>528b4ca6ab5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 528b4ca6ab54cd5f2cee1bcaa77a4c0402ec9d31
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Apr 28 14:11:31 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> Abstract differences between bootstrap scripts
</span>---
.github/azure-workflows/bootstrap.sh | 49 +++++++++++++++++++++++-------------
.github/workflows/bootstrap.sh | 49 +++++++++++++++++++++++-------------
2 files changed, 62 insertions(+), 36 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 d5420ad1a74..6e02bf77d0f 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;'>@@ -2,6 +2,19 @@
</span>
set -e
<span style='display:block; white-space:pre;background:#e0ffe0;'>+printtag() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Azure Pipelines tag format
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "##[$1]${2-}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+begingroup() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printtag "group" "$1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endgroup() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printtag "endgroup"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> OS_MAJOR=$(uname -r | cut -f 1 -d .)
OS_ARCH=$(uname -m)
case "$OS_ARCH" in
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +24,7 @@ case "$OS_ARCH" in
</span> esac
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "##[group]Fetching files"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+begingroup "Fetching files"
</span> # Download resources in background ASAP but use later.
# Use /usr/bin/curl so that we don't use Homebrew curl.
echo "Fetching getopt..."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,22 +36,22 @@ curl_mpbase_pid=$!
</span> echo "Fetching PortIndex..."
/usr/bin/curl -fsSLo ports/PortIndex "https://ftp.fau.de/macports/release/ports/PortIndex_darwin_${OS_MAJOR}_${OS_ARCH}/PortIndex" &
curl_portindex_pid=$!
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "##[endgroup]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endgroup
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "##[group]Info"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+begingroup "Info"
</span> echo "macOS version: $(sw_vers -productVersion)"
echo "IP address: $(/usr/bin/curl -fsS https://www-origin.macports.org/ip.php)"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "##[endgroup]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endgroup
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "##[group]Disabling Spotlight"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+begingroup "Disabling Spotlight"
</span> # Disable Spotlight indexing. We don't need it, and it might cost performance
sudo mdutil -a -i off
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "##[endgroup]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endgroup
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "##[group]Uninstalling Homebrew"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+begingroup "Uninstalling Homebrew"
</span> # Move directories to /opt/off
echo "Moving directories..."
sudo mkdir /opt/off
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,28 +63,28 @@ echo "Removing files..."
</span>
# Rehash to forget about the deleted files
hash -r
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "##[endgroup]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endgroup
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "##[group]Installing getopt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+begingroup "Installing getopt"
</span> # Install getopt required by mpbb
wait $curl_getopt_pid
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:#ffe0e0;'>-echo "##[endgroup]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endgroup
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "##[group]Installing MacPorts"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+begingroup "Installing MacPorts"
</span> # Install MacPorts built by https://github.com/macports/macports-base/tree/master/.github
wait $curl_mpbase_pid
echo "Extracting..."
sudo tar -xpf "MacPorts-${OS_MAJOR}.tar.bz2" -C /
rm -f "MacPorts-${OS_MAJOR}.tar.bz2"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "##[endgroup]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endgroup
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "##[group]Configuring MacPorts"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+begingroup "Configuring MacPorts"
</span> # Set PATH for portindex
source /opt/local/share/macports/setupenv.bash
# Set ports tree to $PWD/ports
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,10 +99,10 @@ echo "archive_site_local https://packages-private.macports.org/:tbz2" | sudo tee
</span> # preferred_hosts has no effect on archive_site_local
# See https://trac.macports.org/ticket/57720
#echo "preferred_hosts packages.macports.org" | sudo tee -a /opt/local/etc/macports/macports.conf >/dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "##[endgroup]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endgroup
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "##[group]Updating PortIndex"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+begingroup "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;'>@@ -101,10 +114,10 @@ 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:#ffe0e0;'>-echo "##[endgroup]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endgroup
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "##[group]Running postflight"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+begingroup "Running postflight"
</span> # Create macports user
sudo /opt/local/libexec/macports/postflight/postflight
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "##[endgroup]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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 71697c61a46..5200f3ac70e 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;'>@@ -2,6 +2,19 @@
</span>
set -e
<span style='display:block; white-space:pre;background:#e0ffe0;'>+printtag() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # GitHub Actions tag format
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "::$1::${2-}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+begingroup() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printtag "group" "$1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endgroup() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printtag "endgroup"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> OS_MAJOR=$(uname -r | cut -f 1 -d .)
OS_ARCH=$(uname -m)
case "$OS_ARCH" in
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +24,7 @@ case "$OS_ARCH" in
</span> esac
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "::group::Fetching files"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+begingroup "Fetching files"
</span> # Download resources in background ASAP but use later.
# Use /usr/bin/curl so that we don't use Homebrew curl.
echo "Fetching getopt..."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,22 +36,22 @@ curl_mpbase_pid=$!
</span> echo "Fetching PortIndex..."
/usr/bin/curl -fsSLo ports/PortIndex "https://ftp.fau.de/macports/release/ports/PortIndex_darwin_${OS_MAJOR}_${OS_ARCH}/PortIndex" &
curl_portindex_pid=$!
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "::endgroup::"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endgroup
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "::group::Info"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+begingroup "Info"
</span> echo "macOS version: $(sw_vers -productVersion)"
echo "IP address: $(/usr/bin/curl -fsS https://www-origin.macports.org/ip.php)"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "::endgroup::"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endgroup
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "::group::Disabling Spotlight"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+begingroup "Disabling Spotlight"
</span> # Disable Spotlight indexing. We don't need it, and it might cost performance
sudo mdutil -a -i off
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "::endgroup::"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endgroup
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "::group::Uninstalling Homebrew"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+begingroup "Uninstalling Homebrew"
</span> # Move directories to /opt/off
echo "Moving directories..."
sudo mkdir /opt/off
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,28 +63,28 @@ echo "Removing files..."
</span>
# Rehash to forget about the deleted files
hash -r
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "::endgroup::"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endgroup
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "::group::Installing getopt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+begingroup "Installing getopt"
</span> # Install getopt required by mpbb
wait $curl_getopt_pid
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:#ffe0e0;'>-echo "::endgroup::"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endgroup
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "::group::Installing MacPorts"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+begingroup "Installing MacPorts"
</span> # Install MacPorts built by https://github.com/macports/macports-base/tree/master/.github
wait $curl_mpbase_pid
echo "Extracting..."
sudo tar -xpf "MacPorts-${OS_MAJOR}.tar.bz2" -C /
rm -f "MacPorts-${OS_MAJOR}.tar.bz2"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "::endgroup::"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endgroup
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "::group::Configuring MacPorts"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+begingroup "Configuring MacPorts"
</span> # Set PATH for portindex
source /opt/local/share/macports/setupenv.bash
# Set ports tree to $PWD/ports
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,10 +99,10 @@ echo "archive_site_local https://packages-private.macports.org/:tbz2" | sudo tee
</span> # preferred_hosts has no effect on archive_site_local
# See https://trac.macports.org/ticket/57720
#echo "preferred_hosts packages.macports.org" | sudo tee -a /opt/local/etc/macports/macports.conf >/dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "::endgroup::"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endgroup
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "::group::Updating PortIndex"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+begingroup "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;'>@@ -101,10 +114,10 @@ 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:#ffe0e0;'>-echo "::endgroup::"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endgroup
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "::group::Running postflight"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+begingroup "Running postflight"
</span> # Create macports user
sudo /opt/local/libexec/macports/postflight/postflight
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "::endgroup::"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endgroup
</span></pre><pre style='margin:0'>
</pre>