From ba2c84bade18d4c47309fc49a2789f22023a234c Mon Sep 17 00:00:00 2001
From: Casper da Costa-Luis <casper.dcl@physics.org>
Date: Wed, 22 Jan 2020 15:23:57 +0000
Subject: [PATCH 1/6] attempt to fix travis snap dpl

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 46643ae1b3..4a1b7863b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -137,6 +137,7 @@ deploy:
     snap: dvc_*.snap
     channel: $RELEASE_SNAP_CHANNEL
     skip_cleanup: true
+    edge: true
     on:
       all_branches: true
       condition: "$(./scripts/ci/deploy_condition.sh dvc_*.snap) && ($TRAVIS_BRANCH = master || -n $TRAVIS_TAG)"

From 555258c75d5cb43aca045ac2b5c4eda49913aaee Mon Sep 17 00:00:00 2001
From: Casper da Costa-Luis <casper.dcl@physics.org>
Date: Wed, 22 Jan 2020 15:25:09 +0000
Subject: [PATCH 2/6] debugging (to revert)

---
 .travis.yml | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4a1b7863b9..982bb6d1ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,9 +10,14 @@ env:
     - PATH="$PYENV_ROOT/bin:$PATH"
     - PIP_CACHE_DIR="$HOME/.cache/pip"  # unify pip cache location for all platforms
 stages:
-  - check
-  - test
-  - build
+  # TODO: revert
+  - debug
+  - name: check
+    if: false
+  - name: test
+    if: false
+  - name: build
+    if: false
 # Travis doesn't support testing python on Mac yet, so we need
 # to workaround it by installing it directly with brew.
 #
@@ -74,6 +79,7 @@ jobs:
     python: 3.7
     script: ./scripts/build_package.sh
   - name: Snapcraft snap
+    stage: debug  # TODO: remove
     addons:
      snaps:
      - name: snapcraft
@@ -140,6 +146,9 @@ deploy:
     edge: true
     on:
       all_branches: true
-      condition: "$(./scripts/ci/deploy_condition.sh dvc_*.snap) && ($TRAVIS_BRANCH = master || -n $TRAVIS_TAG)"
-      repo: iterative/dvc
-      stage: build
+      # TODO: revert for below
+      condition: "true"
+      stage: debug
+      # condition: "$(./scripts/ci/deploy_condition.sh dvc_*.snap) && ($TRAVIS_BRANCH = master || -n $TRAVIS_TAG)"
+      # repo: iterative/dvc
+      # stage: build

From a4a31b3113ec758d7d70c562c992c876194d03a4 Mon Sep 17 00:00:00 2001
From: Casper da Costa-Luis <casper.dcl@physics.org>
Date: Wed, 22 Jan 2020 16:00:48 +0000
Subject: [PATCH 3/6] fix missing env vars

---
 .travis.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 982bb6d1ac..32011daf72 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -89,11 +89,10 @@ jobs:
        channel: stable
     env:
     - SNAPCRAFT_IMAGE_INFO: '{"build_url": "$TRAVIS_BUILD_URL"}'
-    before_install:
+    install:
     - sudo /snap/bin/lxd.migrate -yes
     - sudo /snap/bin/lxd waitready
     - sudo /snap/bin/lxd init --auto
-    install:
     script:
     - ./scripts/build_snap.sh
     after_failure:
@@ -143,7 +142,6 @@ deploy:
     snap: dvc_*.snap
     channel: $RELEASE_SNAP_CHANNEL
     skip_cleanup: true
-    edge: true
     on:
       all_branches: true
       # TODO: revert for below

From f02c804cade5d4080503b20e3644e8ceed29176d Mon Sep 17 00:00:00 2001
From: Casper da Costa-Luis <casper.dcl@physics.org>
Date: Wed, 22 Jan 2020 16:04:42 +0000
Subject: [PATCH 4/6] tidy up

---
 .travis.yml                  | 2 +-
 scripts/ci/before_install.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 32011daf72..cac473d953 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -140,7 +140,7 @@ deploy:
       stage: build
   - provider: snap
     snap: dvc_*.snap
-    channel: $RELEASE_SNAP_CHANNEL
+    channel: $SNAP_CHANNEL
     skip_cleanup: true
     on:
       all_branches: true
diff --git a/scripts/ci/before_install.sh b/scripts/ci/before_install.sh
index bf0f1b4c98..2e9461be41 100644
--- a/scripts/ci/before_install.sh
+++ b/scripts/ci/before_install.sh
@@ -52,7 +52,7 @@ elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
 fi
 
 if [[ -n "$TRAVIS_TAG" ]]; then
-    echo "export RELEASE_SNAP_CHANNEL=stable" >> env.sh
+    echo "export SNAP_CHANNEL=stable" >> env.sh
 else
-    echo "export RELEASE_SNAP_CHANNEL=edge" >> env.sh
+    echo "export SNAP_CHANNEL=edge" >> env.sh
 fi

From 7526eb1a2f179324009963666709ae5d3579b9c6 Mon Sep 17 00:00:00 2001
From: Casper da Costa-Luis <casper.dcl@physics.org>
Date: Wed, 22 Jan 2020 16:06:58 +0000
Subject: [PATCH 5/6] fix before_install checks

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index cac473d953..8731a6efac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -79,6 +79,8 @@ jobs:
     python: 3.7
     script: ./scripts/build_package.sh
   - name: Snapcraft snap
+    language: python
+    python: 3.7
     stage: debug  # TODO: remove
     addons:
      snaps:

From 66ad722964b2b017bad2bf5ffc531a1f4d585b64 Mon Sep 17 00:00:00 2001
From: Casper da Costa-Luis <casper.dcl@physics.org>
Date: Wed, 22 Jan 2020 16:28:43 +0000
Subject: [PATCH 6/6] Revert "debugging (to revert)"

This reverts commit 555258c75d5cb43aca045ac2b5c4eda49913aaee.
---
 .travis.yml | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8731a6efac..971a2bb9e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,14 +10,9 @@ env:
     - PATH="$PYENV_ROOT/bin:$PATH"
     - PIP_CACHE_DIR="$HOME/.cache/pip"  # unify pip cache location for all platforms
 stages:
-  # TODO: revert
-  - debug
-  - name: check
-    if: false
-  - name: test
-    if: false
-  - name: build
-    if: false
+  - check
+  - test
+  - build
 # Travis doesn't support testing python on Mac yet, so we need
 # to workaround it by installing it directly with brew.
 #
@@ -81,7 +76,6 @@ jobs:
   - name: Snapcraft snap
     language: python
     python: 3.7
-    stage: debug  # TODO: remove
     addons:
      snaps:
      - name: snapcraft
@@ -146,9 +140,6 @@ deploy:
     skip_cleanup: true
     on:
       all_branches: true
-      # TODO: revert for below
-      condition: "true"
-      stage: debug
-      # condition: "$(./scripts/ci/deploy_condition.sh dvc_*.snap) && ($TRAVIS_BRANCH = master || -n $TRAVIS_TAG)"
-      # repo: iterative/dvc
-      # stage: build
+      condition: "$(./scripts/ci/deploy_condition.sh dvc_*.snap) && ($TRAVIS_BRANCH = master || -n $TRAVIS_TAG)"
+      repo: iterative/dvc
+      stage: build