From 42bddce21f4654bfb305be50e3dd7b7c13faa52b Mon Sep 17 00:00:00 2001
From: Asher <ash@coder.com>
Date: Tue, 14 Jan 2020 13:12:10 -0600
Subject: [PATCH] Add defaults for environment variables

So we don't have to keep setting them for each CI and every single step
since there doesn't seem to be a way to share them between steps in
Drone.
---
 .travis.yml     |  8 --------
 scripts/ci.bash | 10 ++++++----
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 34628a0e..e3a7f6a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,14 +4,6 @@ node_js:
 services:
   - docker
 
-before_install:
-  - export MAJOR_VERSION="2"
-  - export VSCODE_VERSION="1.41.1"
-  - export VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER"
-  - export TAG="$VERSION-vsc$VSCODE_VERSION"
-  - if [[ "$TRAVIS_BRANCH" == "master" ]]; then export MINIFY="true"; fi
-  - if [[ "$TRAVIS_BRANCH" == "master" ]]; then export PACKAGE="true"; fi
-
 # Don't build on tags because we'll already have built the commit.
 jobs:
   include:
diff --git a/scripts/ci.bash b/scripts/ci.bash
index 96aff3ae..078b06fa 100755
--- a/scripts/ci.bash
+++ b/scripts/ci.bash
@@ -57,16 +57,18 @@ function main() {
 	cd "$(dirname "${0}")/.."
 
 	local codeServerVersion="${VERSION:-}"
-	local vscodeVersion="${VSCODE_VERSION:-}"
+	local vscodeVersion="${VSCODE_VERSION:-1.41.1}"
 	local ostype="${OSTYPE:-}"
 	local package="${PACKAGE:-}"
 
 	if [[ -z "${codeServerVersion}" ]] ; then
-		>&2 echo "Must set VERSION environment variable"; exit 1
+		codeServerVersion="2.${TRAVIS_TAG:-${DRONE_TAG:-daily}}"
 	fi
 
-	if [[ -z "${vscodeVersion}" ]] ; then
-		>&2 echo "Must set VSCODE_VERSION environment variable"; exit 1
+	local branch="${TRAVIS_BRANCH:-DRONE_BRANCH}"
+	if [[ $branch == "master" ]] ; then
+		export MINIFY="true"
+		export PACKAGE="true"
 	fi
 
 	if [[ "${ostype}" == "darwin"* ]]; then
-- 
GitLab