Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
87ebf03eb7 | ||
|
|
df1c34e291 | ||
|
|
4a65b58772 | ||
|
|
11fdb8854b | ||
|
|
0a92bb1607 | ||
|
|
5bac2cbdb8 | ||
|
|
511c3e95b2 |
11
.travis.yml
11
.travis.yml
@@ -4,17 +4,17 @@ jobs:
|
|||||||
include:
|
include:
|
||||||
- name: Test
|
- name: Test
|
||||||
if: tag IS blank
|
if: tag IS blank
|
||||||
script: ./ci/image/run.sh "yarn && GITHUB_TOKEN=3229b0eec0a1622d6d1d1e00fca5b626070f5a10 yarn vscode && ./ci/ci.sh"
|
script: ./ci/image/run.sh "yarn && git submodule update --init && yarn vscode:patch && ./ci/ci.sh"
|
||||||
deploy: null
|
deploy: null
|
||||||
- name: Linux Release
|
- name: Linux Release
|
||||||
if: tag IS present
|
if: tag IS present
|
||||||
script:
|
script:
|
||||||
- travis_wait 60 ./ci/image/run.sh "yarn && yarn vscode && ci/release.sh"
|
- travis_wait 60 ./ci/image/run.sh "yarn && yarn vscode && ci/release.sh && ./ci/build-test.sh"
|
||||||
- ./ci/release-image/push.sh
|
- ./ci/release-image/push.sh
|
||||||
- name: Linux ARM64 Release
|
- name: Linux ARM64 Release
|
||||||
if: tag IS present
|
if: tag IS present
|
||||||
script:
|
script:
|
||||||
- ./ci/image/run.sh "yarn && yarn vscode && ci/release.sh"
|
- ./ci/image/run.sh "yarn && yarn vscode && ci/release.sh && ./ci/build-test.sh"
|
||||||
- ./ci/release-image/push.sh
|
- ./ci/release-image/push.sh
|
||||||
arch: arm64
|
arch: arm64
|
||||||
- name: MacOS Release
|
- name: MacOS Release
|
||||||
@@ -22,7 +22,7 @@ jobs:
|
|||||||
os: osx
|
os: osx
|
||||||
language: node_js
|
language: node_js
|
||||||
node_js: 12
|
node_js: 12
|
||||||
script: yarn && yarn vscode && travis_wait 60 ci/release.sh
|
script: yarn && yarn vscode && travis_wait 60 ci/release.sh && ./ci/build-test.sh
|
||||||
|
|
||||||
before_deploy:
|
before_deploy:
|
||||||
- echo "$JSON_KEY" | base64 --decode > ./ci/key.json
|
- echo "$JSON_KEY" | base64 --decode > ./ci/key.json
|
||||||
@@ -31,6 +31,7 @@ deploy:
|
|||||||
- provider: releases
|
- provider: releases
|
||||||
edge: true
|
edge: true
|
||||||
draft: true
|
draft: true
|
||||||
|
overwrite: true
|
||||||
tag_name: $TRAVIS_TAG
|
tag_name: $TRAVIS_TAG
|
||||||
target_commitish: $TRAVIS_COMMIT
|
target_commitish: $TRAVIS_COMMIT
|
||||||
name: $TRAVIS_TAG
|
name: $TRAVIS_TAG
|
||||||
@@ -47,6 +48,8 @@ deploy:
|
|||||||
local_dir: release-upload
|
local_dir: release-upload
|
||||||
on:
|
on:
|
||||||
tags: true
|
tags: true
|
||||||
|
# TODO: The gcs provider fails to install on arm64.
|
||||||
|
condition: $TRAVIS_CPU_ARCH = amd64
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
timeout: 600
|
timeout: 600
|
||||||
|
|||||||
21
ci/build-test.sh
Executable file
21
ci/build-test.sh
Executable file
@@ -0,0 +1,21 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# build-test.bash -- Make sure the build worked.
|
||||||
|
# This is to make sure we don't have Node version errors or any other
|
||||||
|
# compilation-related errors.
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
function main() {
|
||||||
|
cd "$(dirname "${0}")/.." || exit 1
|
||||||
|
|
||||||
|
local output
|
||||||
|
output=$(node ./build/out/node/entry.js --list-extensions 2>&1)
|
||||||
|
if echo "$output" | grep 'was compiled against a different Node.js version'; then
|
||||||
|
echo "$output"
|
||||||
|
exit 1
|
||||||
|
else
|
||||||
|
echo "Build ran successfully"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
main "$@"
|
||||||
@@ -5,9 +5,22 @@ set -euo pipefail
|
|||||||
main() {
|
main() {
|
||||||
cd "$(dirname "$0")/../.."
|
cd "$(dirname "$0")/../.."
|
||||||
|
|
||||||
|
# This, strangely enough, fixes the arm build being terminated for not having
|
||||||
|
# output on Travis. It's as if output is buffered and only displayed once a
|
||||||
|
# certain amount is collected. Five seconds didn't work but one second seems
|
||||||
|
# to generate enough output to make it work.
|
||||||
|
local pid
|
||||||
|
while true; do
|
||||||
|
echo 'Still running...'
|
||||||
|
sleep 1
|
||||||
|
done &
|
||||||
|
pid=$!
|
||||||
|
|
||||||
docker build ci/image
|
docker build ci/image
|
||||||
imageTag="$(docker build -q ci/image)"
|
imageTag="$(docker build -q ci/image)"
|
||||||
docker run -t --rm -e CI -e GITHUB_TOKEN -e TRAVIS_TAG -v "$(yarn cache dir):/usr/local/share/.cache/yarn/v6" -v "$PWD:/repo" -w /repo "$imageTag" "$*"
|
docker run -t --rm -e CI -e GITHUB_TOKEN -e TRAVIS_TAG -v "$(yarn cache dir):/usr/local/share/.cache/yarn/v6" -v "$PWD:/repo" -w /repo "$imageTag" "$*"
|
||||||
|
|
||||||
|
kill $pid
|
||||||
}
|
}
|
||||||
|
|
||||||
main "$@"
|
main "$@"
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ function package() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
local arch
|
local arch
|
||||||
arch="$(uname -m)"
|
arch=$(uname -m | sed 's/aarch/arm/')
|
||||||
|
|
||||||
echo -n "Creating release..."
|
echo -n "Creating release..."
|
||||||
|
|
||||||
|
|||||||
@@ -10,6 +10,44 @@ index e73dd4d9e8..e3192b3a0d 100644
|
|||||||
resources/server
|
resources/server
|
||||||
build/node_modules
|
build/node_modules
|
||||||
coverage/
|
coverage/
|
||||||
|
diff --git a/.yarnrc b/.yarnrc
|
||||||
|
index 7808166004..1e16cde724 100644
|
||||||
|
--- a/.yarnrc
|
||||||
|
+++ b/.yarnrc
|
||||||
|
@@ -1,3 +1,3 @@
|
||||||
|
-disturl "https://atom.io/download/electron"
|
||||||
|
-target "7.1.11"
|
||||||
|
-runtime "electron"
|
||||||
|
+disturl "http://nodejs.org/dist"
|
||||||
|
+target "12.4.0"
|
||||||
|
+runtime "node"
|
||||||
|
diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
|
||||||
|
index 7a2320d828..5768890636 100644
|
||||||
|
--- a/build/npm/postinstall.js
|
||||||
|
+++ b/build/npm/postinstall.js
|
||||||
|
@@ -33,9 +33,9 @@ function yarnInstall(location, opts) {
|
||||||
|
|
||||||
|
yarnInstall('extensions'); // node modules shared by all extensions
|
||||||
|
|
||||||
|
-yarnInstall('remote'); // node modules used by vscode server
|
||||||
|
+// yarnInstall('remote'); // node modules used by vscode server
|
||||||
|
|
||||||
|
-yarnInstall('remote/web'); // node modules used by vscode web
|
||||||
|
+// yarnInstall('remote/web'); // node modules used by vscode web
|
||||||
|
|
||||||
|
const allExtensionFolders = fs.readdirSync('extensions');
|
||||||
|
const extensions = allExtensionFolders.filter(e => {
|
||||||
|
@@ -68,7 +68,7 @@ runtime "${runtime}"`;
|
||||||
|
}
|
||||||
|
|
||||||
|
yarnInstall(`build`); // node modules required for build
|
||||||
|
-yarnInstall('test/automation'); // node modules required for smoketest
|
||||||
|
-yarnInstall('test/smoke'); // node modules required for smoketest
|
||||||
|
-yarnInstall('test/integration/browser'); // node modules required for integration
|
||||||
|
+// yarnInstall('test/automation'); // node modules required for smoketest
|
||||||
|
+// yarnInstall('test/smoke'); // node modules required for smoketest
|
||||||
|
+// yarnInstall('test/integration/browser'); // node modules required for integration
|
||||||
|
yarnInstallBuildDependencies(); // node modules for watching, specific to host node version, not electron
|
||||||
diff --git a/coder.js b/coder.js
|
diff --git a/coder.js b/coder.js
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000000..6aee0e46bc
|
index 0000000000..6aee0e46bc
|
||||||
|
|||||||
@@ -16,9 +16,6 @@ main() {
|
|||||||
cd lib/vscode
|
cd lib/vscode
|
||||||
# Install VS Code dependencies.
|
# Install VS Code dependencies.
|
||||||
yarn
|
yarn
|
||||||
|
|
||||||
# NODE_MODULE_VERSION mismatch errors without this.
|
|
||||||
npm rebuild
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user