Discourse Charm

Merge ~rahdjoudj/discourse-charm/+git/discourse-charm:discourse-charm into discourse-charm:master

  1. Git
  2. lp:~rahdjoudj/discourse-charm/+git/discourse-charm
  3. discourse-charm
  4. Merge into master
Proposed by Reda Ahdjoudj
Status: Merged
Approved by: Haw Loeung
Approved revision: aee255aed1276b55e22e187eb071d29ec8d549ba
Merged at revision: 70f7f14b81528c205e773dcf10ccf33cc7718862
Proposed branch: ~rahdjoudj/discourse-charm/+git/discourse-charm:discourse-charm
Merge into: discourse-charm:master
Diff against target: 92 lines (+12/-11)
4 files modified
Makefile (+7/-8)
config.yaml (+1/-1)
layer.yaml (+3/-2)
wheelhouse.txt (+1/-0)
Reviewer Review Type Date Requested Status
Stuart Bishop (community) Approve
Discourse Charm Maintainers Pending
Review via email: mp+376383@code.launchpad.net

Commit message

Bug Fix(1855216): adding wheelhouse - update ruby default version - add brotli compression package to layer

Description of the change

adding psutil to wheelhouse so it's present in venv, since system package are not used.

Update default ruby version to be compatible with current discourse.

Add Brotli compression library to layer.yaml packages list as it's needed by discourse.

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.

Revision history for this message
Stuart Bishop (stub) wrote :

Per inline comments, a few points to justify or tweak before landing.

review: Needs Information
Revision history for this message
Reda Ahdjoudj (rahdjoudj) wrote :

> Per inline comments, a few points to justify or tweak before landing.

Made the tweaks. Left the git add as I'm not sure of why it's in there.

Revision history for this message
Stuart Bishop (stub) wrote :

Yup

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change cannot be self approved, setting status to needs review.

Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change must be approved by a member of one of the following teams:
 - discourse-charmers
Setting status to needs review.

Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 70f7f14b81528c205e773dcf10ccf33cc7718862

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/Makefile b/Makefile
index b612804..9a67e0a 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ LAYER_BRANCH := master
26DEVEL_BRANCH := test-built26DEVEL_BRANCH := test-built
27STABLE_BRANCH := built27STABLE_BRANCH := built
2828
29BUILD_DIR := $(JUJU_REPOSITORY)/builds/$(CHARM_NAME)29BUILD_DIR := $(CHARM_DIR)/builds
30CHARM_STORE_URL := $(CHARM_NAME)30CHARM_STORE_URL := $(CHARM_NAME)
3131
32SHELL := /bin/bash32SHELL := /bin/bash
@@ -47,25 +47,24 @@ $(BUILD_DIR):
47# from the working tree including all untracked and uncommitted47# from the working tree including all untracked and uncommitted
48# updates.48# updates.
49.PHONY: build49.PHONY: build
50build: | $(BUILD_DIR)50build: charm build -f -o $(BUILD_DIR)
51 charm build -f -o $(JUJU_REPOSITORY) -n $(CHARM_NAME)
5251
5352
54# Generate a fresh development build and commit it to $(TEST_BRANCH).53# Generate a fresh development build and commit it to $(DEVEL_BRANCH).
55# Only builds work committed to $(LAYER_BRANCH).54# Only builds work committed to $(LAYER_BRANCH).
56.PHONY: dev-build55.PHONY: dev-build
57build-dev: | $(BUILD_DIR)56build-dev:
58 -cd $(BUILD_DIR) && git merge --abort57 -cd $(BUILD_DIR) && git merge --abort
59 cd $(BUILD_DIR) \58 cd $(BUILD_DIR) \
60 && git reset --hard $(TEST_BRANCH) \59 && git reset --hard $(DEVEL_BRANCH) \
61 && git clean -fxd \60 && git clean -fxd \
62 && git merge --log --no-commit -s ours \61 && git merge --log --no-commit -s ours \
63 -m "charm-build of $(LAYER_BRANCH)" $(LAYER_BRANCH)62 -m "charm-build of $(LAYER_BRANCH)" $(LAYER_BRANCH)
64 rm -rf .tmp-repo63 rm -rf .tmp-repo
65 git clone -b $(LAYER_BRANCH) . .tmp-repo64 git clone -b $(LAYER_BRANCH) . .tmp-repo
66 charm build -f -o $(JUJU_REPOSITORY) -n $(CHARM_NAME) .tmp-repo65 charm build -f -o $(BUILD_DIR) .tmp-repo
67 rm -rf .tmp-repo66 rm -rf .tmp-repo
68 cd $(BUILD_DIR) && git add . 67 cd $(BUILD_DIR) && git add .
69 -cd $(BUILD_DIR) && git commit --no-edit68 -cd $(BUILD_DIR) && git commit --no-edit
7069
7170
diff --git a/config.yaml b/config.yaml
index b3366a8..e3c9261 100644
--- a/config.yaml
+++ b/config.yaml
@@ -21,7 +21,7 @@ options:
21 description: "Default mirror to pull Ruby from, choose one closest to your datacenter."21 description: "Default mirror to pull Ruby from, choose one closest to your datacenter."
22 ruby-version:22 ruby-version:
23 type: string23 type: string
24 default: '2.4.4'24 default: '2.6.5'
25 description: "Default Ruby version to install. Choose a version sufficiently new for Discourse."25 description: "Default Ruby version to install. Choose a version sufficiently new for Discourse."
26 admin-users:26 admin-users:
27 type: string27 type: string
diff --git a/layer.yaml b/layer.yaml
index c3d5c9a..98ca04d 100644
--- a/layer.yaml
+++ b/layer.yaml
@@ -1,4 +1,4 @@
1includes: 1includes:
2 - 'layer:ruby'2 - 'layer:ruby'
3 - 'layer:git-deploy'3 - 'layer:git-deploy'
4 - 'interface:pgsql'4 - 'interface:pgsql'
@@ -16,7 +16,7 @@ options:
16 - gifsicle16 - gifsicle
17 - libpq-dev17 - libpq-dev
18 - redis-server18 - redis-server
19 - python3-psutil19 # - python3-psutil
20 - postfix20 - postfix
21 - postgresql-client-common21 - postgresql-client-common
22 - postgresql-client22 - postgresql-client
@@ -26,6 +26,7 @@ options:
26 # Ubuntu) or else an as yet nonexistent version of 3.x or later26 # Ubuntu) or else an as yet nonexistent version of 3.x or later
27 # that supports ES6 or at least "const" out of the box.27 # that supports ES6 or at least "const" out of the box.
28 - node-uglify28 - node-uglify
29 - brotli
29 git-deploy:30 git-deploy:
30 target: /srv/discourse31 target: /srv/discourse
31repo: 'https://git.launchpad.net/discourse-charm'32repo: 'https://git.launchpad.net/discourse-charm'
diff --git a/wheelhouse.txt b/wheelhouse.txt
32new file mode 10064433new file mode 100644
index 0000000..686138b
--- /dev/null
+++ b/wheelhouse.txt
@@ -0,0 +1 @@
1psutil>=5.4.2,<6.0.0

Subscribers

People subscribed via source and target branches