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

Proposed by Tom Haddon
Status: Merged
Approved by: Benjamin Allot
Approved revision: 148
Merged at revision: 147
Proposed branch: lp:~mthaddon/mojo/no-more-build-phase
Merge into: lp:mojo/mojo-specs
Diff against target: 78 lines (+10/-10)
5 files modified
mojo-how-to/devel/build (+5/-0)
mojo-how-to/manifest (+2/-3)
mojo-how-to/manifest-update-content (+1/-1)
mojo-how-to/manifests/perform-autodeploy-unchecked (+1/-3)
mojo-how-to/manifests/test-autodeploy (+1/-3)
To merge this branch: bzr merge lp:~mthaddon/mojo/no-more-build-phase
Reviewer Review Type Date Requested Status
Benjamin Allot Approve
Review via email: mp+377622@code.launchpad.net

Commit message

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

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

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

Revision history for this message
Benjamin Allot (ballot) wrote :

LGTM

review: Approve
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

Change successfully merged at revision 147

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mojo-how-to/devel/build'
2--- mojo-how-to/devel/build 2016-04-07 08:40:32 +0000
3+++ mojo-how-to/devel/build 2020-01-15 09:58:57 +0000
4@@ -5,6 +5,11 @@
5 set -e
6 set -u
7
8+for prog in make bzr markdown; do
9+ echo "Checking for existence of ${prog}"
10+ command -v ${prog}
11+done
12+
13 cd ${MOJO_BUILD_DIR}/mojo
14 make generate-docs
15 tar cvpf ${MOJO_LOCAL_DIR}/mojo.tar --directory=docs/www .
16
17=== modified file 'mojo-how-to/manifest'
18--- mojo-how-to/manifest 2019-02-04 07:38:29 +0000
19+++ mojo-how-to/manifest 2020-01-15 09:58:57 +0000
20@@ -1,9 +1,8 @@
21-# We need the markdown package to be able to generate the docs for Mojo
22-builddeps packages=make,markdown
23 # Run the collect step
24 collect
25+# We need the markdown package to be able to generate the docs for Mojo
26 # Run the build step
27-build
28+script config=build
29 # Run pre-deploy script
30 script config=pre-deploy
31 # Deploy services only
32
33=== modified file 'mojo-how-to/manifest-update-content'
34--- mojo-how-to/manifest-update-content 2016-01-04 10:26:48 +0000
35+++ mojo-how-to/manifest-update-content 2020-01-15 09:58:57 +0000
36@@ -1,7 +1,7 @@
37 # Pull down the latest content
38 collect
39 # Run the build step
40-build
41+script config=build
42 # Copy our built resources to the instances
43 script config=upload-built-content BUILD_LABEL=revno
44 # Update the config variable so our content is updated
45
46=== modified file 'mojo-how-to/manifests/perform-autodeploy-unchecked'
47--- mojo-how-to/manifests/perform-autodeploy-unchecked 2015-10-12 10:07:47 +0000
48+++ mojo-how-to/manifests/perform-autodeploy-unchecked 2020-01-15 09:58:57 +0000
49@@ -4,10 +4,8 @@
50
51 # Pull down the latest content
52 collect
53-# Set builddeps
54-builddeps packages=make,markdown,bzr
55 # Run the build step
56-build config=build-desired-revno
57+script config=build-desired-revno
58 # Copy our built resources to the instances
59 script config=upload-built-content BUILD_LABEL=revno
60 # Update the config variable so our content is updated
61
62=== modified file 'mojo-how-to/manifests/test-autodeploy'
63--- mojo-how-to/manifests/test-autodeploy 2015-10-09 13:21:27 +0000
64+++ mojo-how-to/manifests/test-autodeploy 2020-01-15 09:58:57 +0000
65@@ -11,12 +11,10 @@
66 # Having confirmed there's a deployment to test, we first need to bring the
67 # environment up in it's current state on production
68
69-# We need the markdown package to be able to generate the docs for Mojo
70-builddeps packages=make,markdown,bzr
71 # Run the collect step
72 collect
73 # Run the build step
74-build config=build-production-revno
75+script config=build-production-revno
76 # Deploy services only
77 deploy config=services local=services-secret delay=0
78 # Copy our built resources to the instances

Subscribers

People subscribed via source and target branches

to all changes: