launchpad-reviewers team mailing list archive

[Colin Watson <mp+439639@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/lp-signing:charmcraft into lp-signing:master.

Commit message:
charm: Build using charmcraft

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

I've left the old build system in place as well for a transitional period, but this is much simpler and will let us use Launchpad charm recipes.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/lp-signing:charmcraft into lp-signing:master.

diff --git a/charm/.gitignore b/charm/.gitignore
index 04ae82c..da831d3 100644
--- a/charm/.gitignore
+++ b/charm/.gitignore
@@ -1,3 +1,4 @@
+*.charm
 bundle.yaml
 dist
 tmp
diff --git a/charm/lp-signing/charmcraft.yaml b/charm/lp-signing/charmcraft.yaml
new file mode 100644
index 0000000..b74001b
--- /dev/null
+++ b/charm/lp-signing/charmcraft.yaml
@@ -0,0 +1,46 @@
+type: charm
+bases:
+  - build-on:
+    - name: ubuntu
+      channel: "18.04"
+      architectures: [amd64]
+    run-on:
+    - name: ubuntu
+      channel: "18.04"
+      architectures: [amd64]
+parts:
+  charm-wheels:
+    source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
+    source-commit: "81b18be78649b73fda9a65dbbb1e02fc3aba166f"
+    source-submodules: []
+    source-type: git
+    plugin: dump
+    organize:
+      "*": charm-wheels/
+    prime:
+      - "-charm-wheels"
+  ols-layers:
+    source: https://git.launchpad.net/ols-charm-deps
+    source-commit: "e13ccad47df4f05afbf93fa62ddafe180fde78aa"
+    source-submodules: []
+    source-type: git
+    plugin: dump
+    organize:
+      "*": layers/
+    stage:
+      - layers
+    prime:
+      - "-layers"
+  lp-signing:
+    after:
+      - charm-wheels
+      - ols-layers
+    source: .
+    plugin: reactive
+    build-snaps: [charm/2.x/stable]
+    build-packages: [libpq-dev]
+    build-environment:
+      - CHARM_LAYERS_DIR: $CRAFT_STAGE/layers/layer
+      - CHARM_INTERFACES_DIR: $CRAFT_STAGE/layers/interface
+      - PIP_NO_INDEX: "true"
+      - PIP_FIND_LINKS: $CRAFT_STAGE/charm-wheels