From a065c12e836768e3e05065227a7fd70484517f6f Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Tue, 18 Feb 2020 23:31:40 -0500 Subject: [PATCH] CI Fixes --- .editorconfig | 6 ------ .travis.yml | 1 + ci/release-image/push.sh | 4 ++-- ci/release.sh | 4 ++-- 4 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index 072deab1..00000000 --- a/.editorconfig +++ /dev/null @@ -1,6 +0,0 @@ -root = true - -[*] -indent_style = space -trim_trailing_whitespace = true -indent_size = 2 \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 17b1e1d6..d9278d4b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ language: minimal jobs: include: - name: Test + if: tag IS blank script: ./ci/image/run.sh "yarn && yarn vscode && ./ci/ci.sh" deploy: null - name: Linux Release diff --git a/ci/release-image/push.sh b/ci/release-image/push.sh index 4734a120..cf4581c0 100755 --- a/ci/release-image/push.sh +++ b/ci/release-image/push.sh @@ -4,7 +4,7 @@ set -euo pipefail main() { cd "$(dirname "$0")/../.." - soruce ./ci/lib.sh + source ./ci/lib.sh set_version if [[ ${CI:-} ]]; then @@ -17,7 +17,7 @@ main() { imageTag+="-arm64" latest="codercom/code-server:arm64" fi - docker build -t "$imageTag" -t "$latest" -f ./ci/release-image/Dockerfile + docker build -t "$imageTag" -t "$latest" -f ./ci/release-image/Dockerfile . docker push codercom/code-server } diff --git a/ci/release.sh b/ci/release.sh index 84d4d179..32f9ea67 100755 --- a/ci/release.sh +++ b/ci/release.sh @@ -35,7 +35,7 @@ function main() { for binary in code-server*; do mkdir -p "../binary-upload" - local prefix="code-server-$code_server_version-" + local prefix="code-server-$VERSION-" local target="${binary#$prefix}" if [[ $target == "linux-x86_64" ]]; then echo "Copying $binary to ../binary-upload/latest-linux" @@ -43,7 +43,7 @@ function main() { fi local gcp_dir - gcp_dir="../binary-upload/releases/$code_server_version/$target" + gcp_dir="../binary-upload/releases/$VERSION/$target" mkdir -p "$gcp_dir" echo "Copying $binary to $gcp_dir/code-server"