Merge ~peter-sabaini/charm-hw-health:add-submodules-target into ~nagios-charmers/charm-hw-health:master

Proposed by Peter Sabaini
Status: Merged
Approved by: Jeremy Lounder
Approved revision: 2f1dad5e2251ef5a4a790bfc3ac2e30a57ee9e8d
Merged at revision: 064925e1509771f3aa1267135963f059863dcdab
Proposed branch: ~peter-sabaini/charm-hw-health:add-submodules-target
Merge into: ~nagios-charmers/charm-hw-health:master
Diff against target: 29 lines (+6/-1)
1 file modified
Makefile (+6/-1)
Reviewer Review Type Date Requested Status
Jeremy Lounder (community) Approve
Zachary Zehring (community) Approve
Review via email: mp+376190@code.launchpad.net

Commit message

Submodules target

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

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

Revision history for this message
Zachary Zehring (zzehring) :
review: Approve
Revision history for this message
Jeremy Lounder (jldev) :
review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 064925e1509771f3aa1267135963f059863dcdab

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index 8e68711..70f7666 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -8,6 +8,7 @@ help:
6 @echo "This project supports the following targets"
7 @echo ""
8 @echo " make help - show this text"
9+ @echo " make submodules - make sure that the submodules are up-to-date"
10 @echo " make lint - use pre-commit to ensure consistent layout"
11 @echo " make test - run the functional test, unittests and lint"
12 @echo " make unittest - run the tests defined in the unittest subdirectory"
13@@ -16,6 +17,10 @@ help:
14 @echo " make clean - remove unneeded files"
15 @echo ""
16
17+submodules:
18+ @echo "Cloning submodules"
19+ @git submodule update --init --recursive
20+
21 lint:
22 @echo "Running flake8"
23 cd src && tox -e pep8
24@@ -66,4 +71,4 @@ clean:
25 rm -rf $$dir ; done
26
27 # The targets below don't depend on a file
28-.PHONY: lint test unittest build release clean help
29+.PHONY: lint test unittest build release clean help submodules

Subscribers

People subscribed via source and target branches