File tree Expand file tree Collapse file tree 2 files changed +6
-12
lines changed Expand file tree Collapse file tree 2 files changed +6
-12
lines changed Original file line number Diff line number Diff line change @@ -4,14 +4,6 @@ node_js:
44services :
55 - docker
66
7- before_install :
8- - export MAJOR_VERSION="2"
9- - export VSCODE_VERSION="1.41.1"
10- - export VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER"
11- - export TAG="$VERSION-vsc$VSCODE_VERSION"
12- - if [[ "$TRAVIS_BRANCH" == "master" ]]; then export MINIFY="true"; fi
13- - if [[ "$TRAVIS_BRANCH" == "master" ]]; then export PACKAGE="true"; fi
14-
157# Don't build on tags because we'll already have built the commit.
168jobs :
179 include :
Original file line number Diff line number Diff line change @@ -57,16 +57,18 @@ function main() {
5757 cd " $( dirname " ${0} " ) /.."
5858
5959 local codeServerVersion=" ${VERSION:- } "
60- local vscodeVersion=" ${VSCODE_VERSION:- } "
60+ local vscodeVersion=" ${VSCODE_VERSION:- 1.41.1 } "
6161 local ostype=" ${OSTYPE:- } "
6262 local package=" ${PACKAGE:- } "
6363
6464 if [[ -z " ${codeServerVersion} " ]] ; then
65- >&2 echo " Must set VERSION environment variable " ; exit 1
65+ codeServerVersion= " 2. ${TRAVIS_TAG :- ${DRONE_TAG :- daily} } "
6666 fi
6767
68- if [[ -z " ${vscodeVersion} " ]] ; then
69- >&2 echo " Must set VSCODE_VERSION environment variable" ; exit 1
68+ local branch=" ${TRAVIS_BRANCH:- DRONE_BRANCH} "
69+ if [[ $branch == " master" ]] ; then
70+ export MINIFY=" true"
71+ export PACKAGE=" true"
7072 fi
7173
7274 if [[ " ${ostype} " == " darwin" * ]]; then
You can’t perform that action at this time.
0 commit comments