Merge ~hloeung/mailman3-core-charm:master into mailman3-core-charm:master

[Haw Loeung]

Add support for building charm with charmcraft pack

[James Simpson (jsimpso)]

LGTM

review: Approve

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

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

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

Change successfully merged at revision 4136b31910090d592572ece49c6dd9abf31d0dde

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3b821e7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,15 @@
+*.charm
+*.pyc
+*.swp
+*~
+.coverage
+.pytest_cache/
+.tox/
+.unit-state.db
+__pycache__/
+build/
+builds/
+deps/
+htmlcov/
+repo-info
+revision
diff --git a/Makefile b/Makefile
index 915cac6..095bae3 100644
--- a/Makefile
+++ b/Makefile
@@ -12,23 +12,8 @@ test: lint
 	nosetests3 unit_tests/*
 	@echo "\nAmulet based tests in ./tests should be run with bundletester against the built charm"
 
-CHARM_REPO = lp:mailman3-core-charm
-CHARM_NAME = mailman3-core
-CHARM_DEST ?= ~/tmp/$(CHARM_NAME)
-CHARM_BUILD ?= ~/tmp
+clean:
+	@echo "Cleaning files"
+	@git clean -ffXd
 
-charm-build:
-	$(eval TMP_CHARM_BUILD_DIR = $(shell mktemp -d -p $(CHARM_BUILD) charm-build.$(CHARM_NAME).XXXXXXXX))
-	@if [ -z $(CHARM_NAME) ]; then \
-		echo "Unable to work out charm name from metadata.yaml"; \
-		exit 1; \
-	fi
-	charm build -o $(TMP_CHARM_BUILD_DIR)
-	@if [ -d $(CHARM_DEST)/ ]; then \
-                git -C $(CHARM_DEST)/ pull; \
-        else \
-                git clone -- $(CHARM_REPO) $(CHARM_DEST)/; \
-	fi
-	rsync -a --exclude .git --delete -- $(TMP_CHARM_BUILD_DIR)/builds/$(CHARM_NAME)/ $(CHARM_DEST)/
-	@echo "Built charm in $(CHARM_DEST)"
-	rm -rf -- $(TMP_CHARM_BUILD_DIR)
+.PHONY: clean lint test
diff --git a/charmcraft.yaml b/charmcraft.yaml
new file mode 100644
index 0000000..1da5d37
--- /dev/null
+++ b/charmcraft.yaml
@@ -0,0 +1,21 @@
+type: "charm"
+bases:
+  - build-on:
+    - name: "ubuntu"
+      channel: "18.04"
+    - name: "ubuntu"
+      channel: "20.04"
+    - name: "ubuntu"
+      channel: "21.10"
+    run-on:
+    - name: "ubuntu"
+      channel: "18.04"
+    - name: "ubuntu"
+      channel: "20.04"
+    - name: "ubuntu"
+      channel: "21.10"
+parts:
+  charm:
+    source: .
+    plugin: reactive
+    build-snaps: [charm]