Skip to content

snap: build fixes #3990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
efiop merged 9 commits into from
Jun 9, 2020
Merged

snap: build fixes #3990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b59442b
snap: drop sudo
casperdcl Jun 9, 2020
ec5107f
snap: ci: fix builds
casperdcl Jun 9, 2020
69f3307
snap: ci: developer notifications
casperdcl Jun 9, 2020
77b41a9
snap: minimise size
casperdcl Jun 9, 2020
232baf0
debug commit
casperdcl Jun 9, 2020
42b343e
Revert "snap: minimise size"
casperdcl Jun 9, 2020
d4ea871
fix image info
casperdcl Jun 9, 2020
c1db88e
Revert "debug commit"
casperdcl Jun 9, 2020
b30de57
snap: v1 channels
casperdcl Jun 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,12 @@ jobs:
- name: lxd
channel: stable
env:
- SNAPCRAFT_IMAGE_INFO: '{"build_url": "$TRAVIS_BUILD_URL"}'
- SNAPCRAFT_IMAGE_INFO: |
'{"build_url": "$TRAVIS_JOB_WEB_URL"}'
- SNAPCRAFT_BUILD_ENVIRONMENT: lxd
- SNAPCRAFT_BUILD_INFO: 1 # https://snapcraft.io/blog/introducing-developer-notifications-for-snap-security-updates
install:
- sudo usermod --append --groups lxd $USER
- sudo /snap/bin/lxd.migrate -yes
- sudo /snap/bin/lxd waitready
- sudo /snap/bin/lxd init --auto
Expand Down
2 changes: 1 addition & 1 deletion scripts/build_snap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if [ ! -d "dvc" ]; then
exit 1
fi

sudo snapcraft --use-lxd
sg lxd -c snapcraft

pip uninstall -y dvc
if which dvc; then
Expand Down
6 changes: 3 additions & 3 deletions scripts/ci/before_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ fi

if [[ -n "$TRAVIS_TAG" ]]; then
if [[ $(echo "$TRAVIS_TAG" | grep -E '^[0-9]+\.[0-9]+\.[0-9]+$') ]]; then
echo "export SNAP_CHANNEL=stable" >>env.sh
echo "export SNAP_CHANNEL=stable,v1/stable" >>env.sh
else
echo "export SNAP_CHANNEL=beta" >>env.sh
echo "export SNAP_CHANNEL=beta,v1/beta" >>env.sh
fi
else
echo "export SNAP_CHANNEL=edge" >>env.sh
echo "export SNAP_CHANNEL=edge,v1/edge" >>env.sh
fi