1
diff --git a/Makefile b/Makefile
2
index 647cacd..214579c 100644
3
--- a/Makefile
4
+++ b/Makefile
5
@@ -37,12 +37,12 @@ clean:
6
37
	@rm -rf ${CHARM_BUILD_DIR}/${CHARM_NAME}
37
	@rm -rf ${CHARM_BUILD_DIR}/${CHARM_NAME}
7
38
38
8
39
submodules:
39
submodules:
11
40
	@echo "Cloning submodules"
40
	# @git submodule update --init --recursive
12
41
	@git submodule update --init --recursive
41
	@echo "No submodules. Skipping."
13
42
42
14
43
submodules-update:
43
submodules-update:
17
44
	@echo "Pulling latest updates for submodules"
44
	# @git submodule update --init --recursive --remote --merge
18
45
	@git submodule update --init --recursive --remote --merge
45
	@echo "No submodules. Skipping."
19
46
46
20
47
build:
47
build:
21
48
	@echo "Building charm to directory ${CHARM_BUILD_DIR}/${CHARM_NAME}"
48
	@echo "Building charm to directory ${CHARM_BUILD_DIR}/${CHARM_NAME}"
22
@@ -66,8 +66,8 @@ proof:
23
66
	@charm proof src
66
	@charm proof src
24
67
67
25
68
unittests:
68
unittests:
28
69
	@echo "Running unit tests"
69
	# @cd src && tox -e unit
29
70
	@cd src && tox -e unit
70
	@echo "No unit tests. Skipping."
30
71
71
31
72
functional: build
72
functional: build
32
73
	@echo "Executing functional tests in ${CHARM_BUILD_DIR}"
73
	@echo "Executing functional tests in ${CHARM_BUILD_DIR}"
Status:	Merged
Approved by:	Alvaro Uria on 2020-08-11
Approved revision:	d0df3f5e8c39c09b65830b3f40bee507084b0485
Merged at revision:	d0df3f5e8c39c09b65830b3f40bee507084b0485
Proposed branch:	~peppepetra/charm-prometheus-blackbox-exporter:skip_targets
Merge into:	charm-prometheus-blackbox-exporter:master
Diff against target:	32 lines (+6/-6) 1 file modified Makefile (+6/-6)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Alvaro Uria (community)		2020-08-11	Approve on 2020-08-11
Review via email: mp+389070@code.launchpad.net
1	diff --git a/Makefile b/Makefile
2	index 647cacd..214579c 100644
3	--- a/Makefile
4	+++ b/Makefile
5	@@ -37,12 +37,12 @@ clean:
6	37	@rm -rf ${CHARM_BUILD_DIR}/${CHARM_NAME}	37	@rm -rf ${CHARM_BUILD_DIR}/${CHARM_NAME}
7	38		38
8	39	submodules:	39	submodules:
11	40	@echo "Cloning submodules"	40	# @git submodule update --init --recursive
12	41	@git submodule update --init --recursive	41	@echo "No submodules. Skipping."
13	42		42
14	43	submodules-update:	43	submodules-update:
17	44	@echo "Pulling latest updates for submodules"	44	# @git submodule update --init --recursive --remote --merge
18	45	@git submodule update --init --recursive --remote --merge	45	@echo "No submodules. Skipping."
19	46		46
20	47	build:	47	build:
21	48	@echo "Building charm to directory ${CHARM_BUILD_DIR}/${CHARM_NAME}"	48	@echo "Building charm to directory ${CHARM_BUILD_DIR}/${CHARM_NAME}"
22	@@ -66,8 +66,8 @@ proof:
23	66	@charm proof src	66	@charm proof src
24	67		67
25	68	unittests:	68	unittests:
28	69	@echo "Running unit tests"	69	# @cd src && tox -e unit
29	70	@cd src && tox -e unit	70	@echo "No unit tests. Skipping."
30	71		71
31	72	functional: build	72	functional: build
32	73	@echo "Executing functional tests in ${CHARM_BUILD_DIR}"	73	@echo "Executing functional tests in ${CHARM_BUILD_DIR}"