Merge ~ballot/mailman3-web-charm/+git/mailman3-web-charm:update_focal into mailman3-web-charm:master

Proposed by Benjamin Allot
Status: Work in progress
Proposed branch: ~ballot/mailman3-web-charm/+git/mailman3-web-charm:update_focal
Merge into: mailman3-web-charm:master
Diff against target: 24 lines (+2/-1)
2 files modified
Makefile (+1/-1)
metadata.yaml (+1/-0)
Reviewer Review Type Date Requested Status
Canonical IS Reviewers Pending
Mailman3 charm maintainers Pending
Review via email: mp+408648@code.launchpad.net

Commit message

Add focal support

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.

Unmerged commits

7ac771a... by Benjamin Allot

Add support for focal

c8192a8... by Benjamin Allot

Fix charm-build recipe

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index 26a2f19..c2d93d4 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -30,6 +30,6 @@ charm-build:
6 else \
7 git clone -- $(CHARM_REPO) $(CHARM_DEST)/; \
8 fi
9- rsync -a --exclude .git --delete -- $(TMP_CHARM_BUILD_DIR)/builds/$(CHARM_NAME)/ $(CHARM_DEST)/
10+ rsync -a --exclude .git --delete -- $(TMP_CHARM_BUILD_DIR)/$(CHARM_NAME)/ $(CHARM_DEST)/
11 @echo "Built charm in $(CHARM_DEST)"
12 rm -rf -- $(TMP_CHARM_BUILD_DIR)
13diff --git a/metadata.yaml b/metadata.yaml
14index 114b5f2..bef14f6 100644
15--- a/metadata.yaml
16+++ b/metadata.yaml
17@@ -5,6 +5,7 @@ description: |
18 This is the web interface to the mailman3 mailing list manager, including the
19 HyperKitty archiver and Postorius list administration interface.
20 series:
21+ - focal
22 - bionic
23 tags:
24 - ops

Subscribers

People subscribed via source and target branches