646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
21 lines
884 B
Diff
21 lines
884 B
Diff
diff --git a/ci/build/build-vscode.sh b/ci/build/build-vscode.sh
|
|
index a72549fb..3aed1ad5 100755
|
|
--- a/ci/build/build-vscode.sh
|
|
+++ b/ci/build/build-vscode.sh
|
|
@@ -58,7 +58,6 @@ main() {
|
|
# telemetry available; telemetry can still be disabled by flag or setting).
|
|
# This needs to be done before building as Code will read this file and embed
|
|
# it into the client-side code.
|
|
- git checkout product.json # Reset in case the script exited early.
|
|
cp product.json product.original.json # Since jq has no inline edit.
|
|
jq --slurp '.[0] * .[1]' product.original.json <(
|
|
cat << EOF
|
|
@@ -105,7 +104,6 @@ EOF
|
|
# Reset so if you develop after building you will not be stuck with the wrong
|
|
# commit (the dev client will use `oss-dev` but the dev server will still use
|
|
# product.json which will have `stable-$commit`).
|
|
- git checkout product.json
|
|
|
|
popd
|
|
|