Merge lp:~mthaddon/mojo/no-more-build-phase into lp:mojo/mojo-specs

[Tom Haddon]

mojo-how-to: Switch from build to script steps for the example project, so it can be used from a containerless project

mojo-how-to: Switch from build to script steps for the example project, so it can be used from a containerless project.

Following this, we'll update the mojo docs on mojo.canonical.com to recommend a containerless project.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Benjamin Allot (ballot)]

LGTM

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 147

=== modified file 'mojo-how-to/devel/build'
--- mojo-how-to/devel/build	2016-04-07 08:40:32 +0000
+++ mojo-how-to/devel/build	2020-01-15 09:58:57 +0000
@@ -5,6 +5,11 @@
 set -e
 set -u
 
+for prog in make bzr markdown; do
+    echo "Checking for existence of ${prog}"
+    command -v ${prog}
+done
+
 cd ${MOJO_BUILD_DIR}/mojo
 make generate-docs
 tar cvpf ${MOJO_LOCAL_DIR}/mojo.tar --directory=docs/www .

=== modified file 'mojo-how-to/manifest'
--- mojo-how-to/manifest	2019-02-04 07:38:29 +0000
+++ mojo-how-to/manifest	2020-01-15 09:58:57 +0000
@@ -1,9 +1,8 @@
-# We need the markdown package to be able to generate the docs for Mojo
-builddeps packages=make,markdown
 # Run the collect step
 collect
+# We need the markdown package to be able to generate the docs for Mojo
 # Run the build step
-build
+script config=build
 # Run pre-deploy script
 script config=pre-deploy
 # Deploy services only

=== modified file 'mojo-how-to/manifest-update-content'
--- mojo-how-to/manifest-update-content	2016-01-04 10:26:48 +0000
+++ mojo-how-to/manifest-update-content	2020-01-15 09:58:57 +0000
@@ -1,7 +1,7 @@
 # Pull down the latest content
 collect
 # Run the build step
-build
+script config=build
 # Copy our built resources to the instances
 script config=upload-built-content BUILD_LABEL=revno
 # Update the config variable so our content is updated

=== modified file 'mojo-how-to/manifests/perform-autodeploy-unchecked'
--- mojo-how-to/manifests/perform-autodeploy-unchecked	2015-10-12 10:07:47 +0000
+++ mojo-how-to/manifests/perform-autodeploy-unchecked	2020-01-15 09:58:57 +0000
@@ -4,10 +4,8 @@
 
 # Pull down the latest content
 collect
-# Set builddeps
-builddeps packages=make,markdown,bzr
 # Run the build step
-build config=build-desired-revno
+script config=build-desired-revno
 # Copy our built resources to the instances
 script config=upload-built-content BUILD_LABEL=revno
 # Update the config variable so our content is updated

=== modified file 'mojo-how-to/manifests/test-autodeploy'
--- mojo-how-to/manifests/test-autodeploy	2015-10-09 13:21:27 +0000
+++ mojo-how-to/manifests/test-autodeploy	2020-01-15 09:58:57 +0000
@@ -11,12 +11,10 @@
 # Having confirmed there's a deployment to test, we first need to bring the
 # environment up in it's current state on production
 
-# We need the markdown package to be able to generate the docs for Mojo
-builddeps packages=make,markdown,bzr
 # Run the collect step
 collect
 # Run the build step
-build config=build-production-revno
+script config=build-production-revno
 # Deploy services only
 deploy config=services local=services-secret delay=0
 # Copy our built resources to the instances