Skip to content

Commit

Permalink
Use code-server commit in product.json
Browse files Browse the repository at this point in the history
Also remove github.com from the trusted domains.  This causes the
browser to block the popup instead (probably because the space between
interaction and popup is too great), which is difficult to notice in
Chromium.  Even in Firefox with the extra bar they add at the top it can
be easy to miss.
  • Loading branch information
code-asher committed Sep 29, 2023
1 parent 0dc59c0 commit 2eba7af
Showing 1 changed file with 11 additions and 8 deletions.
19 changes: 11 additions & 8 deletions ci/build/build-vscode.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,16 @@ main() {

source ./ci/lib.sh

# Set the commit Code will embed into the product.json. We need to do this
# since Code tries to get the commit from the `.git` directory which will fail
# as it is a submodule.
#
# Also, we use code-server's commit rather than VS Code's otherwise it would
# not update when only our patch files change, and that will cause caching
# issues where the browser keeps using outdated code.
export BUILD_SOURCEVERSION
BUILD_SOURCEVERSION=$(git rev-parse HEAD)

pushd lib/vscode

if [[ ! ${VERSION-} ]]; then
Expand All @@ -48,12 +58,6 @@ main() {
exit 1
fi

# Set the commit Code will embed into the product.json. We need to do this
# since Code tries to get the commit from the `.git` directory which will fail
# as it is a submodule.
export BUILD_SOURCEVERSION
BUILD_SOURCEVERSION=$(git rev-parse HEAD)

# Add the date, our name, links, enable telemetry (this just makes telemetry
# available; telemetry can still be disabled by flag or setting), and
# configure trusted extensions (since some, like github.copilot-chat, never
Expand Down Expand Up @@ -90,8 +94,7 @@ main() {
"tipsAndTricksUrl": "https://go.microsoft.com/fwlink/?linkid=852118",
"newsletterSignupUrl": "https://www.research.net/r/vsc-newsletter",
"linkProtectionTrustedDomains": [
"https://open-vsx.org",
"https://*.github.com"
"https://open-vsx.org"
],
"trustedExtensionAuthAccess": [
"vscode.git", "vscode.github",
Expand Down

0 comments on commit 2eba7af

Please sign in to comment.