launchpad-reviewers team mailing list archive

[Colin Watson <mp+436552@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/lp-codeimport:charm-2.x-stable into lp-codeimport:master.

Commit message:
Use the 2.x/stable channel of the charm snap

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/lp-codeimport/+git/lp-codeimport/+merge/436552

The latest version has trouble building charms for 16.04.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/lp-codeimport:charm-2.x-stable into lp-codeimport:master.

diff --git a/charm/Makefile b/charm/Makefile
index 9c48788..9002ea5 100644
--- a/charm/Makefile
+++ b/charm/Makefile
@@ -125,7 +125,7 @@ setup-jenkaas:
 	echo SNAPPY_STORE_NO_CDN=1 | sudo tee -a /etc/environment >/dev/null
 	echo SNAPPY_TESTING=1 | sudo tee -a /etc/environment >/dev/null
 	sudo systemctl start snapd.socket
-	sudo snap install --classic charm
+	sudo snap install --classic --channel 2.x/stable charm
 
 .PHONY: $(foreach charm,$(CHARMS),build-$(charm))
 .PHONY: all build clean deploy lint payload publish setup-jenkaas