prepare for VSCode marketplace #1875
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
garyverhaegen-da
requested review from
cocreature,
ndmitchell,
neil-da and
dasormeter
neil-da
approved these changes
Jun 25, 2019
7 tasks
|
Here is the diff switching from nix to Bazel, for easy comparison (excluding the generated files in diff --git a/BUILD b/BUILD
index ed590eb5..de21c0ec 100644
--- a/BUILD
+++ b/BUILD
@@ -201,3 +201,12 @@ da_haskell_repl(
"//daml-assistant/daml-helper",
],
)
+
+# vsce executable for publishing to marketplace
+
+load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
+
+nodejs_binary(
+ name = "vsce",
+ entry_point = "//daml-foundations/daml-tools/daml-extension:node_modules/vsce/out/vsce",
+)
diff --git a/azure-cron.yml b/azure-cron.yml
index 6b8303c1..86eeaefd 100644
--- a/azure-cron.yml
+++ b/azure-cron.yml
@@ -177,8 +177,8 @@ jobs:
echo "Publishing $GITHUB to VSCode Marketplace"
git checkout $GITHUB
cd daml-foundations/daml-tools/daml-extension
- yarn
- vsce publish ${GITHUB#v} -p $MARKETPLACE_TOKEN
+ bazel run @nodejs//:bin/yarn
+ bazel run @daml_extension_deps//vsce/bin:vsce -- publish ${GITHUB#v} -p $MARKETPLACE_TOKEN
else
if [[ "${GITHUB#v}" == "$MARKET" ]]; then
echo "Version on marketplace is already the latest ($GITHUB)."
diff --git a/daml-foundations/daml-tools/daml-extension/package.json b/daml-foundations/daml-tools/daml-extension/package.json
index db208f8b..cebaa0e8 100644
--- a/daml-foundations/daml-tools/daml-extension/package.json
+++ b/daml-foundations/daml-tools/daml-extension/package.json
@@ -134,6 +134,7 @@
"devDependencies": {
"typescript": "3.3.3",
"@types/node": "6.0.42",
- "vscode": "1.1.33"
+ "vscode": "1.1.33",
+ "vsce": "1.64.0"
}
}
diff --git a/dev-env/bin/vsce b/dev-env/bin/vsce
deleted file mode 120000
index 943ba2d8..00000000
--- a/dev-env/bin/vsce
+++ /dev/null
@@ -1 +0,0 @@
-../lib/dade-exec-nix-tool
\ No newline at end of file
diff --git a/nix/packages.nix b/nix/packages.nix
index d3a2697d..ba25aff5 100644
--- a/nix/packages.nix
+++ b/nix/packages.nix
@@ -128,8 +128,6 @@ in rec {
(import ./tools/live-server { inherit pkgs; nodejs = tools.node; }).live-server;
license-checker =
(import ./tools/license-checker { inherit pkgs; nodejs = tools.node; }).license-checker;
- vsce =
- (import ./tools/vsce { inherit pkgs; nodejs = tools.node; }).vsce;
# This override is necessary to be able to run automated UI tests with Selenium 3.12.0
# The override can be removed when nixpkgs snapshot moved past the commit of 6b91b0d09f582f308a8ad4de526df494ff363622
diff --git a/nix/tools/vsce/README.md b/nix/tools/vsce/README.md
deleted file mode 100644
index f402da9f..00000000
--- a/nix/tools/vsce/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-```
-node2nix --nodejs-8 -i node-packages.json
-```
diff --git a/nix/tools/vsce/node-packages.json b/nix/tools/vsce/node-packages.json
deleted file mode 100644
index f88b9601..00000000
--- a/nix/tools/vsce/node-packages.json
+++ /dev/null
@@ -1 +0,0 @@
-["vsce"]Tradeoffs as I see them, after discussing with @aherrmann-da, @cocreature and @stefanobaghino-da:
For what it's worth I've found the experience of setting it up through nix a lot more pleasant; finding the right values for the All things considered I have a slight preference for the nix approach, mainly because I am very reluctant to tie our own dependencies with vsce's; I'd prefer thinking of it as an executable we download, and not need to care that it's currently written in JS and distributed through npm. |
|
Good to know on Bazel, thanks for tracking that down. Happy to stick with Nix given your preferences. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the first step in a three-step process to get us to a point where the VSCode extension gets pushed to the marketplace automatically on every new release. Here are the steps:
vsceto the dev-env.package.jsonfile to reference the correct license & org.Huge thanks to @dasormeter for laying a lot of the groundwork this builds upon (see #416).