From a4a03c14922ccaec2a9ff8d1b7b2af8522a4214d Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Mon, 12 Oct 2020 02:09:48 -0400 Subject: [PATCH] Fix CI --- ci/build/build-release.sh | 2 +- ci/build/npm-postinstall.sh | 4 ++++ ci/build/release-github-assets.sh | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ci/build/build-release.sh b/ci/build/build-release.sh index eedda98e..8f71dc33 100755 --- a/ci/build/build-release.sh +++ b/ci/build/build-release.sh @@ -25,7 +25,6 @@ main() { rsync README.md "$RELEASE_PATH" rsync LICENSE.txt "$RELEASE_PATH" rsync ./lib/vscode/ThirdPartyNotices.txt "$RELEASE_PATH" - rsync ./lib/coder-cloud-agent "$RELEASE_PATH/lib" # code-server exports types which can be imported and used by plugins. Those # types import ipc.d.ts but it isn't included in the final vscode build so @@ -60,6 +59,7 @@ EOF if [ "$KEEP_MODULES" = 1 ]; then rsync node_modules/ "$RELEASE_PATH/node_modules" + rsync ./lib/coder-cloud-agent "$RELEASE_PATH/lib" fi } diff --git a/ci/build/npm-postinstall.sh b/ci/build/npm-postinstall.sh index 74b90478..bd7922d5 100755 --- a/ci/build/npm-postinstall.sh +++ b/ci/build/npm-postinstall.sh @@ -24,6 +24,10 @@ main() { ;; esac + OS="$(uname | tr '[:upper:]' '[:lower:]')" + curl -fsSL "https://storage.googleapis.com/coder-cloud-releases/agent/latest/$OS/cloud-agent" -o ./lib/coder-cloud-agent + chmod +x ./lib/coder-cloud-agent + if ! vscode_yarn; then echo "You may not have the required dependencies to build the native modules." echo "Please see https://github.com/cdr/code-server/blob/master/doc/npm.md" diff --git a/ci/build/release-github-assets.sh b/ci/build/release-github-assets.sh index f2d9ff8c..7fba6770 100755 --- a/ci/build/release-github-assets.sh +++ b/ci/build/release-github-assets.sh @@ -11,7 +11,7 @@ main() { source ./ci/lib.sh download_artifact release-packages ./release-packages - local assets=(./release-packages/code-server*"$VERSION"*{.tar.gz,.zip,.deb,.rpm}) + local assets=(./release-packages/code-server*"$VERSION"*{.tar.gz,.deb,.rpm}) for i in "${!assets[@]}"; do assets[$i]="--attach=${assets[$i]}" done