Merge pull request #3209 from casperdcl/snap-deploy

fix snap stable & edge release errors

.travis.yml

@@ -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

scripts/ci/before_install.sh

@@ -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

snap/snapcraft.yaml

@@ -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