Merge ~gabrielcocenza/juju-lint:bug/1979696 into juju-lint:master

Proposed by Gabriel Cocenza
Status: Merged
Approved by: Eric Chen
Approved revision: f005001b5c12a395beea15bee38741871632cb3c
Merged at revision: dba0d2d9441dccad3a5844a75e536a4c92d2c670
Proposed branch: ~gabrielcocenza/juju-lint:bug/1979696
Merge into: juju-lint:master
Diff against target: 20 lines (+1/-1)
1 file modified
snap/snapcraft.yaml (+1/-1)
Reviewer Review Type Date Requested Status
Eric Chen Approve
Review via email: mp+425412@code.launchpad.net

Commit message

build the snap with local repository.

- source-type git ends up using the code from the master branch
instead of using the local repo as expected.

- added git in stage-packages because otherwise the snap fails to
build.

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
Eric Chen (eric-chen) :
review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision dba0d2d9441dccad3a5844a75e536a4c92d2c670

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 69b6b71..156bb68 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -21,7 +21,6 @@ parts:
21 requirements:21 requirements:
22 - requirements.txt22 - requirements.txt
23 source: .23 source: .
24 source-type: git
25 # Classic core20 snaps require staged python.24 # Classic core20 snaps require staged python.
26 python-packages: [pip, setuptools, wheel]25 python-packages: [pip, setuptools, wheel]
27 stage-packages:26 stage-packages:
@@ -36,6 +35,7 @@ parts:
36 - python3-setuptools35 - python3-setuptools
37 - python3-venv36 - python3-venv
38 - python3-wheel37 - python3-wheel
38 - git
39 override-build: |39 override-build: |
40 snapcraftctl build40 snapcraftctl build
41 echo "Version: $(python3 setup.py --version)"41 echo "Version: $(python3 setup.py --version)"

Subscribers

People subscribed via source and target branches