<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository mpbb.
</pre>
<p><a href="https://github.com/macports/mpbb/commit/f97db48d2b71523aeb70f63ecbbd697cc3ee1aba">https://github.com/macports/mpbb/commit/f97db48d2b71523aeb70f63ecbbd697cc3ee1aba</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 f97db48 Do not restrict which builders build noarch ports
</span>f97db48 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f97db48d2b71523aeb70f63ecbbd697cc3ee1aba
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Nov 6 08:12:30 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> Do not restrict which builders build noarch ports
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The arm64 Buildbot builder is faster so we want to build most noarch
</span><span style='display:block; white-space:pre;color:#404040;'> ports there. Similarly, the 10.6 i386 builder is idle more often so we
</span><span style='display:block; white-space:pre;color:#404040;'> want to build ports there when we can. But some noarch ports or their
</span><span style='display:block; white-space:pre;color:#404040;'> dependencies might only be buildable on the x86_64 builders. We also
</span><span style='display:block; white-space:pre;color:#404040;'> want ports to be built on the GitHub Actions CI infrastructure and right
</span><span style='display:block; white-space:pre;color:#404040;'> now those are x86_64 only.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> In the situation where both Buildbot builders are available at the same
</span><span style='display:block; white-space:pre;color:#404040;'> time and both try to build it, I assume that buildbot master is
</span><span style='display:block; white-space:pre;color:#404040;'> single-threaded and will only process one builder's upload at a time so
</span><span style='display:block; white-space:pre;color:#404040;'> that only one builder's archive and its signature will end up on the
</span><span style='display:block; white-space:pre;color:#404040;'> package server. Which one is undefined and I assume that is not
</span><span style='display:block; white-space:pre;color:#404040;'> important.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/62977
</span>---
tools/sort-with-subports.tcl | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tools/sort-with-subports.tcl b/tools/sort-with-subports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 60c6a56..267e800 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/tools/sort-with-subports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tools/sort-with-subports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -339,21 +339,14 @@ while {[llength $todo] > 0} {
</span> }
}
i386 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$supported_archs eq "noarch"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$::macports::os_major >= 20} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info exists requestedports($p)]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts stderr "Excluding $portinfo(name) because the [lindex [split ${::macports::macosx_version} .] 0]_arm64 builder will build it"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set outputports($p) 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${is_64bit_capable}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$::macports::os_major >= 18 && $supported_archs ne "" && "x86_64" ni $supported_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${is_64bit_capable}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$::macports::os_major >= 18 && $supported_archs ne "" && $supported_archs ne "noarch" && "x86_64" ni $supported_archs} {
</span> if {[info exists requestedports($p)]} {
puts stderr "Excluding $portinfo(name) because it does not support the x86_64 arch"
}
set outputports($p) 0
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {$supported_archs ne "" && ("x86_64" ni $supported_archs || "i386" ni $supported_archs)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {$supported_archs ne "" && $supported_archs ne "noarch" && ("x86_64" ni $supported_archs || "i386" ni $supported_archs)} {
</span> if {[info exists requestedports($p)]} {
puts stderr "Excluding $portinfo(name) because the ${::macports::macosx_version}_x86_64 builder will build it"
}
</pre><pre style='margin:0'>
</pre>