launchpad-reviewers team mailing list archive

[Colin Watson <mp+431210@xxxxxxxxxxxxxxxxxx>]

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

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

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/431210

The 3.x channel has introduced quite a bit of build breakage.  Pin the `2.x/stable` channel for now, since that actually works.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:charm-2.x-stable into launchpad:master.

diff --git a/charm/launchpad-appserver/charmcraft.yaml b/charm/launchpad-appserver/charmcraft.yaml
index 824480b..ff2bada 100644
--- a/charm/launchpad-appserver/charmcraft.yaml
+++ b/charm/launchpad-appserver/charmcraft.yaml
@@ -10,7 +10,7 @@ parts:
   launchpad-appserver:
     source: .
     plugin: reactive
-    build-snaps: [charm]
+    build-snaps: [charm/2.x/stable]
     build-packages: [libpq-dev]
     build-environment:
       - CHARM_LAYERS_DIR: tmp/deps/ols-layers/layer
diff --git a/charm/launchpad/charmcraft.yaml b/charm/launchpad/charmcraft.yaml
index 0f68a93..0c3d3f2 100644
--- a/charm/launchpad/charmcraft.yaml
+++ b/charm/launchpad/charmcraft.yaml
@@ -10,7 +10,7 @@ parts:
   launchpad:
     source: .
     plugin: reactive
-    build-snaps: [charm]
+    build-snaps: [charm/2.x/stable]
     build-environment:
       - CHARM_LAYERS_DIR: tmp/deps/ols-layers/layer
       - CHARM_INTERFACES_DIR: tmp/deps/ols-layers/interface