launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #26425
[Merge] ~cjwatson/lp-signing:fix-charm-build-path into lp-signing:master
Colin Watson has proposed merging ~cjwatson/lp-signing:fix-charm-build-path into lp-signing:master.
Commit message:
charm: Adjust for changes in charm output path
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~cjwatson/lp-signing/+git/lp-signing/+merge/398690
The charm build toolchain seems to have dropped the "builds" segment from its output path.
--
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/lp-signing:fix-charm-build-path into lp-signing:master.
diff --git a/charm/Makefile b/charm/Makefile
index 48c85ea..927f2a5 100644
--- a/charm/Makefile
+++ b/charm/Makefile
@@ -48,7 +48,7 @@ dist/.built-%: $(CHARM_DEPS) | $(BUILDDIR)
clean-%:
@echo "Cleaning $*..."
- @rm -rf dist/.built-$* dist/builds/$* $(PUBLISHDIR)/$*
+ @rm -rf dist/.built-$* dist/$* $(PUBLISHDIR)/$*
tmp/signing.launchpad.test.crt: | $(TMPDIR)
openssl req -new -nodes -keyout tmp/signing.launchpad.test.key \
@@ -96,7 +96,7 @@ clean:
lint: build
@echo "Linting charms..."
@set -e; for charm in $(CHARMS); do \
- charm proof dist/builds/$$charm; \
+ charm proof dist/$$charm; \
done
@echo "Linting python sources..."
@flake8 layer $(CHARMS)
@@ -110,7 +110,7 @@ publish: build lint | $(PUBLISHDIR)
$(PUBLISHDIR)/$$charm; \
fi; \
rsync -a -m --ignore-times --exclude .git --delete \
- dist/builds/$$charm/ $(PUBLISHDIR)/$$charm/; \
+ dist/$$charm/ $(PUBLISHDIR)/$$charm/; \
git -C $(PUBLISHDIR)/$$charm add .; \
if [ "$$(git -C $(PUBLISHDIR)/$$charm status --porcelain || \
echo status failed)" ]; then \
diff --git a/charm/bundle.yaml.in b/charm/bundle.yaml.in
index cf34c11..6ebf77e 100644
--- a/charm/bundle.yaml.in
+++ b/charm/bundle.yaml.in
@@ -12,7 +12,7 @@ applications:
charm: cs:postgresql
num_units: 1
lp-signing:
- charm: ./dist/builds/lp-signing
+ charm: ./dist/lp-signing
num_units: 1
options:
build_label: "%BUILD_LABEL%"