Skip to content

fix snap stable & edge release errors #3209

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
merged 3 commits into from
Jan 22, 2020
Merged

fix snap stable & edge release errors #3209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c13b24f
fix master/edge release provider argument conflicts
casperdcl Jan 21, 2020
8a560ec
pin snap version to base version
casperdcl Jan 21, 2020
a6d55e3
ensure correct snap version dirtyness
casperdcl Jan 21, 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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ deploy:
stage: build
- provider: snap
snap: dvc_*.snap
channel: $SNAP_CHANNEL
channel: $RELEASE_SNAP_CHANNEL
skip_cleanup: true
on:
all_branches: true
Expand Down
4 changes: 2 additions & 2 deletions scripts/ci/before_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
fi

if [[ -n "$TRAVIS_TAG" ]]; then
echo "export SNAP_CHANNEL=stable" >> env.sh
echo "export RELEASE_SNAP_CHANNEL=stable" >> env.sh
else
echo "export SNAP_CHANNEL=edge" >> env.sh
echo "export RELEASE_SNAP_CHANNEL=edge" >> env.sh
fi
5 changes: 4 additions & 1 deletion snap/snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,13 @@ parts:
- git
override-pull: |
snapcraftctl pull
echo 'PKG = "snap"' > $SNAPCRAFT_PART_SRC/dvc/utils/build.py
snapcraftctl set-version `cd $SNAPCRAFT_PART_SRC && git describe --tags`
git diff --quiet || error_dirty_build
echo 'PKG = "snap"' > $SNAPCRAFT_PART_SRC/dvc/utils/build.py
# install all optional extras
sed -ri 's/(=install_requires)/\1+all_remotes+hdfs/' $SNAPCRAFT_PART_SRC/setup.py
# ensure dvc knows the state isn't really dirty
sed -rin 's/.*git.*diff.*--quiet.*//' $SNAPCRAFT_PART_SRC/dvc/version.py
override-build: |
snapcraftctl build
cp $SNAPCRAFT_PART_BUILD/scripts/completion/dvc.bash $SNAPCRAFT_PART_INSTALL/completion.sh
Expand Down