snap: deploy: fix major channels not being pushed (#4222)

iterative · Jul 17, 2020 · 4edf368 · 4edf368
1 parent ef82ced
commit 4edf368
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -160,11 +160,3 @@ deploy:
       condition: "$(./scripts/ci/deploy_condition.sh dvc_*.snap) && ($TRAVIS_BRANCH = master || -n $TRAVIS_TAG) && -n $SNAP_CHANNEL"
       repo: iterative/dvc
       stage: build
-  - provider: script
-    skip_cleanup: true
-    script: "(echo $SNAP_TOKEN | snapcraft login --with -) && timeout 600 snapcraft push dvc_*.snap --release $SNAP_CHANNEL_MAJOR || echo timed out"
-    on:
-      all_branches: true
-      condition: "$(./scripts/ci/deploy_condition.sh dvc_*.snap) && ($TRAVIS_BRANCH = master || -n $TRAVIS_TAG) && -n $SNAP_CHANNEL_MAJOR"
-      repo: iterative/dvc
-      stage: build
diff --git a/scripts/ci/before_install.sh b/scripts/ci/before_install.sh
@@ -40,17 +40,14 @@ if [ "$TRAVIS_OS_NAME" == "linux" ]; then
 
   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_MAJOR=v$TAG_MAJOR/stable" >>env.sh
+      SNAP_CHANNEL=stable
     else
-      echo "export SNAP_CHANNEL=beta" >>env.sh
-      echo "export SNAP_CHANNEL_MAJOR=v$TAG_MAJOR/beta" >>env.sh
+      SNAP_CHANNEL=beta
     fi
   else
-    echo "export SNAP_CHANNEL=edge" >>env.sh
-    echo "export SNAP_CHANNEL_MAJOR=v$TAG_MAJOR/edge" >>env.sh
+    SNAP_CHANNEL=edge
   fi
-
+  echo "export SNAP_CHANNEL=${SNAP_CHANNEL},v${TAG_MAJOR}/${SNAP_CHANNEL}" >>env.sh
   # NOTE: after deprecating this major version branch, uncomment this line
-  # echo "unset SNAP_CHANNEL" >>env.sh
+  # echo "export SNAP_CHANNEL=v${TAG_MAJOR}/${SNAP_CHANNEL}" >>env.sh
 fi