Launchpad itself

Merge ~cjwatson/launchpad:charm-only-amd64 into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. charm-only-amd64
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: a0ff6f120a223ffa8fdc68d599f8a7906564c4ff
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:charm-only-amd64
Merge into: launchpad:master
Diff against target: 48 lines (+6/-0)
3 files modified
charm/launchpad-admin/charmcraft.yaml (+2/-0)
charm/launchpad-appserver/charmcraft.yaml (+2/-0)
charm/launchpad/charmcraft.yaml (+2/-0)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+439057@code.launchpad.net

Commit message

charm: Only build LP charms on amd64

Description of the change

There's currently no particular reason to waste time and space building for other architectures, and building for s390x currently fails due to the `charm` snap being unavailable in the `2.x/stable` channel.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

Self-approving; this is pretty trivial.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charm/launchpad-admin/charmcraft.yaml b/charm/launchpad-admin/charmcraft.yaml
2index f831b9f..507bbe3 100644
3--- a/charm/launchpad-admin/charmcraft.yaml
4+++ b/charm/launchpad-admin/charmcraft.yaml
5@@ -3,9 +3,11 @@ bases:
6 - build-on:
7 - name: ubuntu
8 channel: "20.04"
9+ architectures: [amd64]
10 run-on:
11 - name: ubuntu
12 channel: "20.04"
13+ architectures: [amd64]
14 parts:
15 charm-wheels:
16 source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
17diff --git a/charm/launchpad-appserver/charmcraft.yaml b/charm/launchpad-appserver/charmcraft.yaml
18index 4f764a5..8b9bdda 100644
19--- a/charm/launchpad-appserver/charmcraft.yaml
20+++ b/charm/launchpad-appserver/charmcraft.yaml
21@@ -3,9 +3,11 @@ bases:
22 - build-on:
23 - name: ubuntu
24 channel: "20.04"
25+ architectures: [amd64]
26 run-on:
27 - name: ubuntu
28 channel: "20.04"
29+ architectures: [amd64]
30 parts:
31 charm-wheels:
32 source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
33diff --git a/charm/launchpad/charmcraft.yaml b/charm/launchpad/charmcraft.yaml
34index ca6d9c8..0060a18 100644
35--- a/charm/launchpad/charmcraft.yaml
36+++ b/charm/launchpad/charmcraft.yaml
37@@ -3,9 +3,11 @@ bases:
38 - build-on:
39 - name: ubuntu
40 channel: "20.04"
41+ architectures: [amd64]
42 run-on:
43 - name: ubuntu
44 channel: "20.04"
45+ architectures: [amd64]
46 parts:
47 charm-wheels:
48 source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels

Subscribers

People subscribed via source and target branches

to status/vote changes: