Skip to content

Commit 2eba7af

Browse files
committed
Use code-server commit in product.json
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.
1 parent 0dc59c0 commit 2eba7af

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

Diff for: ci/build/build-vscode.sh

+11-8
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,16 @@ main() {
4040

4141
source ./ci/lib.sh
4242

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

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

51-
# Set the commit Code will embed into the product.json. We need to do this
52-
# since Code tries to get the commit from the `.git` directory which will fail
53-
# as it is a submodule.
54-
export BUILD_SOURCEVERSION
55-
BUILD_SOURCEVERSION=$(git rev-parse HEAD)
56-
5761
# Add the date, our name, links, enable telemetry (this just makes telemetry
5862
# available; telemetry can still be disabled by flag or setting), and
5963
# configure trusted extensions (since some, like github.copilot-chat, never
@@ -90,8 +94,7 @@ main() {
9094
"tipsAndTricksUrl": "https://go.microsoft.com/fwlink/?linkid=852118",
9195
"newsletterSignupUrl": "https://www.research.net/r/vsc-newsletter",
9296
"linkProtectionTrustedDomains": [
93-
"https://open-vsx.org",
94-
"https://*.github.com"
97+
"https://open-vsx.org"
9598
],
9699
"trustedExtensionAuthAccess": [
97100
"vscode.git", "vscode.github",

0 commit comments

Comments
 (0)