Skip to content

Commit

Permalink
Merge pull request #3063 from casperdcl/snap-classic
Browse files Browse the repository at this point in the history
Snap classic deployment
  • Loading branch information
efiop authored Jan 6, 2020
2 parents 19f408b + be762e7 commit 0ad3548
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 28 deletions.
44 changes: 24 additions & 20 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,25 +75,6 @@ jobs:
language: python
python: 3.7
script: ./scripts/build_package.sh
- name: Snapcraft snap
addons:
snaps:
- name: snapcraft
channel: stable
confinement: classic
- name: lxd
channel: stable
env:
- SNAPCRAFT_IMAGE_INFO: '{"build_url": "$TRAVIS_BUILD_URL"}'
before_install:
- sudo /snap/bin/lxd.migrate -yes
- sudo /snap/bin/lxd waitready
- sudo /snap/bin/lxd init --auto
install:
script:
- sudo snapcraft --use-lxd
after_failure:
- sudo journalctl -u snapd
# deploy jobs
- name: "Pypi pkgs"
if: tag is present
Expand All @@ -116,6 +97,30 @@ jobs:
on:
tags: true
repo: iterative/dvc
- name: Snapcraft snap
addons:
snaps:
- name: snapcraft
channel: stable
confinement: classic
- name: lxd
channel: stable
env:
- SNAPCRAFT_IMAGE_INFO: '{"build_url": "$TRAVIS_BUILD_URL"}'
before_install:
- sudo /snap/bin/lxd.migrate -yes
- sudo /snap/bin/lxd waitready
- sudo /snap/bin/lxd init --auto
install:
script:
- sudo snapcraft --use-lxd
after_failure:
- sudo journalctl -u snapd
deploy:
- provider: snap
snap: dvc_*.snap
channel: ${SOURCE_TAG:+stable}${SOURCE_TAG:-edge}
skip_cleanup: true

before_install:
- bash ./scripts/ci/before_install.sh
Expand All @@ -136,7 +141,6 @@ deploy:
- dvc*.deb
- dvc*.pkg
- dvc*.exe
- dvc*.snap
skip_cleanup: true
on:
tags: true
Expand Down
11 changes: 3 additions & 8 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -153,17 +153,12 @@ Currently, this includes support for Python versions 2.7, 3.6 and 3.7.
Snap (Snapcraft)
----------------

Download the latest ``dvc_*.snap`` from the
GitHub `releases page <https://github.com/iterative/dvc/releases>`_.

.. code-block:: bash
snap install dvc_*.snap --dangerous --classic
snap install dvc --classic
Once ``dvc`` is released on the snap store
(`pending request <https://forum.snapcraft.io/t/classic-confinement-request-for-dvc/14124>`_)
there will be no need to download ``dvc_*.snap`` or use ``--dangerous``
(``snap install dvc --classic`` would suffice).
This corresponds to the latest tagged release.
Add ``--edge`` for the latest ``master`` version.

Package
-------
Expand Down

0 comments on commit 0ad3548

Please sign in to comment.