Don't package for release if we don't need to

This commit is contained in:
Asher 2019-08-20 19:44:32 -05:00
parent 534600c1ff
commit ccc4f87ada
No known key found for this signature in database
GPG Key ID: D63C1EF81242354A
2 changed files with 12 additions and 6 deletions

View File

@ -18,6 +18,7 @@ matrix:
- VSCODE_VERSION="1.37.0" MAJOR_VERSION="2" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER" - VSCODE_VERSION="1.37.0" MAJOR_VERSION="2" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER"
before_install: before_install:
- if [[ "$TRAVIS_BRANCH" == "master" ]]; then export MINIFY="true"; fi - if [[ "$TRAVIS_BRANCH" == "master" ]]; then export MINIFY="true"; fi
- if [[ "$TRAVIS_BRANCH" == "master" ]]; then export PACKAGE="true"; fi
script: script:
- scripts/ci.bash - scripts/ci.bash
before_deploy: before_deploy:

View File

@ -33,10 +33,12 @@ function docker-build() {
docker cp ./. "${containerId}":/src docker cp ./. "${containerId}":/src
docker-exec build docker-exec build
if [[ -n "${package}" ]] ; then
docker-exec binary docker-exec binary
docker-exec package docker-exec package
mkdir -p release mkdir -p release
docker cp "${containerId}":/src/release/. ./release/ docker cp "${containerId}":/src/release/. ./release/
fi
docker stop "${containerId}" docker stop "${containerId}"
} }
@ -49,8 +51,10 @@ function local-build() {
} }
local-exec build local-exec build
if [[ -n "${package}" ]] ; then
local-exec binary local-exec binary
local-exec package local-exec package
fi
} }
# Build code-server in the CI. # Build code-server in the CI.
@ -58,6 +62,7 @@ function main() {
local codeServerVersion="${VERSION:-}" local codeServerVersion="${VERSION:-}"
local vscodeVersion="${VSCODE_VERSION:-}" local vscodeVersion="${VSCODE_VERSION:-}"
local ostype="${OSTYPE:-}" local ostype="${OSTYPE:-}"
local package="${PACKAGE:-}"
if [[ -z "${codeServerVersion}" ]] ; then if [[ -z "${codeServerVersion}" ]] ; then
>&2 echo "Must set VERSION environment variable"; exit 1 >&2 echo "Must set VERSION environment variable"; exit 1