From aa05993cf0cf43679722dc91a9aa1847c1131256 Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 5 Jan 2021 15:26:11 -0600 Subject: [PATCH 1/2] Bundle callback.html into final build --- ci/build/build-release.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/build/build-release.sh b/ci/build/build-release.sh index c87645d3..a9de1b7e 100755 --- a/ci/build/build-release.sh +++ b/ci/build/build-release.sh @@ -79,8 +79,9 @@ bundle_vscode() { rsync "$VSCODE_SRC_PATH/extensions/yarn.lock" "$VSCODE_OUT_PATH/extensions" rsync "$VSCODE_SRC_PATH/extensions/postinstall.js" "$VSCODE_OUT_PATH/extensions" - mkdir -p "$VSCODE_OUT_PATH/resources/linux" + mkdir -p "$VSCODE_OUT_PATH/resources/"{linux,web} rsync "$VSCODE_SRC_PATH/resources/linux/code.png" "$VSCODE_OUT_PATH/resources/linux/code.png" + rsync "$VSCODE_SRC_PATH/resources/web/callback.html" "$VSCODE_OUT_PATH/resources/web/callback.html" # Adds the commit and date to product.json jq --slurp '.[0] * .[1]' "$VSCODE_SRC_PATH/product.json" <( From 05530db20e06801c7d60691c17a28cf8ce37238f Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 5 Jan 2021 15:28:42 -0600 Subject: [PATCH 2/2] Fix symlink_asar failing if link is broken This can happen if you `yarn release` without keeping node modules. --- ci/lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/lib.sh b/ci/lib.sh index 49f9ed95..96a413f1 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -103,7 +103,7 @@ RELEASE_PATH="${RELEASE_PATH-release}" # Code itself but also extensions will look specifically in this directory for # files (like the ripgrep binary or the oniguruma wasm). symlink_asar() { - if [ ! -e node_modules.asar ]; then + if [ ! -L node_modules.asar ]; then if [ "${WINDIR-}" ]; then # mklink takes the link name first. mklink /J node_modules.asar node_modules