fix master/edge release provider argument conflicts

This commit is contained in:
Casper da Costa-Luis
2020-01-21 19:50:22 +00:00
parent aa86eab2cc
commit c13b24fb40
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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