[151110] contrib/mp-buildbot
cal at macports.org
cal at macports.org
Sun Aug 7 12:15:29 PDT 2016
Revision: 151110
https://trac.macports.org/changeset/151110
Author: cal at macports.org
Date: 2016-08-07 12:15:29 -0700 (Sun, 07 Aug 2016)
Log Message:
-----------
mp-buildbot: Remove implicit cleanup
Now that we have a separate cleanup step after r151101, remove the implicit
cleanup that install-dependencies and install-port did. Adjust the
documentation where necessary.
Revision Links:
--------------
https://trac.macports.org/changeset/151101
Modified Paths:
--------------
contrib/mp-buildbot/README
contrib/mp-buildbot/mpbb-cleanup
contrib/mp-buildbot/mpbb-install-dependencies
contrib/mp-buildbot/mpbb-install-port
Modified: contrib/mp-buildbot/README
===================================================================
--- contrib/mp-buildbot/README 2016-08-07 17:09:27 UTC (rev 151109)
+++ contrib/mp-buildbot/README 2016-08-07 19:15:29 UTC (rev 151110)
@@ -29,10 +29,8 @@
8. deploy
Must be implemented in the buildmaster
9. cleanup
- You do not have to run this, because install-dependencies runs it on
- error and install-port always runs it. You can run it manually to clean
- up any problems that might have occurred on the buildslave.
mpbb cleanup --prefix /opt/local --port "$port"
+ You will have to run this even if one of the previous steps failed.
## Step Implementation API
Modified: contrib/mp-buildbot/mpbb-cleanup
===================================================================
--- contrib/mp-buildbot/mpbb-cleanup 2016-08-07 17:09:27 UTC (rev 151109)
+++ contrib/mp-buildbot/mpbb-cleanup 2016-08-07 19:15:29 UTC (rev 151110)
@@ -5,8 +5,7 @@
# Do not execute this directly!
cleanup-help() {
- echo "Clean up build remnants and leftovers caused by the build of port --port."
- echo "Note that you should not have to run this explicitly, as it is automatically run after install-dependencies and install-port on error and in any case after gather-archives."
+ echo "Clean up build remnants and leftovers caused by the build of port --port and its dependencies."
}
cleanup() {
Modified: contrib/mp-buildbot/mpbb-install-dependencies
===================================================================
--- contrib/mp-buildbot/mpbb-install-dependencies 2016-08-07 17:09:27 UTC (rev 151109)
+++ contrib/mp-buildbot/mpbb-install-dependencies 2016-08-07 19:15:29 UTC (rev 151110)
@@ -20,13 +20,12 @@
# calculate list of dependencies in-order
dependencies=$("${option_prefix}/bin/port-tclsh" "${thisdir}/tools/dependencies.tcl" "${option_port}")
if [ $? -ne 0 ]; then
- echo "Calculating dependencies for '${option_port}' failed, cleaning up..." >&2
- cleanup
+ echo "Calculating dependencies for '${option_port}' failed, aborting." >&2
return 1
fi
if [ -z "$dependencies" ]; then
- echo "'${option_port}' has no dependencies, continuing..."
+ echo "'${option_port}' has no dependencies, continuing." >&2
return 0
fi
@@ -41,8 +40,7 @@
echo "----> Installing dependency '${depname}', variants: '${depvariants}'"
if ! "${option_prefix}/bin/port" -d install --unrequested "$depname" $depvariants; then
- echo "Build of dependency '${depname}' failed, cleaning up..." >&2
- cleanup
+ echo "Build of dependency '${depname}' failed, aborting." >&2
return 1
fi
done
Modified: contrib/mp-buildbot/mpbb-install-port
===================================================================
--- contrib/mp-buildbot/mpbb-install-port 2016-08-07 17:09:27 UTC (rev 151109)
+++ contrib/mp-buildbot/mpbb-install-port 2016-08-07 19:15:29 UTC (rev 151110)
@@ -16,8 +16,7 @@
fi
if ! "${option_prefix}/bin/port" -d install "${option_port}"; then
- echo "Build failed, cleaning up..."
- cleanup
+ echo "Build of '${option_port}' failed."
return 1
fi
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160807/61d05e32/attachment.html>
More information about the macports-changes
mailing list