Merge remote-tracking branch 'origin/interns/languageserver' into int…

…erns/languageserver

.github/workflows/lspDeploy.yml

@@ -5,7 +5,7 @@ on:
     inputs:
       version:
         type: choice
-        descirption: Which kind of release is this
+        description: Which kind of release is this
         required: true
         options:
           - major
@@ -48,14 +48,15 @@ jobs:
         env:
           VSCE_PAT: ${{ secrets.VSCE_PAT }}
 
-      # - name: Publish IntelliJ plugin
-      #   run: |
-      #     gradle buildPlugin
-      #     curl -i --header "Authorization: Bearer perm:$INTELLIJ_PLUGIN_PERM" -F pluginId=$PLUGIN_ID -F file=@./build/distributions/vespa-1.0-SNAPSHOT.zip https://plugins.jetbrains.com/plugin/uploadPlugin
-      #   wokring-directory: ./integration/schema-language-server/clients/intellij
-      #   env:
-      #     INTELLIJ_PLUGIN_PERM: ${{ secrets.INTELLIJ_PLUGIN_PERM }}
-      #     PLUGIN_ID: 18074
+      - name: Publish IntelliJ plugin
+        run: |
+          python3 bumpVersion.py
+          gradle buildPlugin
+          curl -i --header "Authorization: Bearer $INTELLIJ_PLUGIN_PERM" -F pluginId=$PLUGIN_ID -F file=@./build/distributions/vespa-$(cat VERSION).zip https://plugins.jetbrains.com/plugin/uploadPlugin
+        working-directory: ./integration/schema-language-server/clients/intellij
+        env:
+          INTELLIJ_PLUGIN_PERM: ${{ secrets.INTELLIJ_PLUGIN_PERM }}
+          PLUGIN_ID: 18074
 
       - name: Create PR to bump version
         uses: peter-evans/create-pull-request@v6

integration/schema-language-server/clients/intellij/bumpVersion.py

@@ -0,0 +1,18 @@
+
+import json
+
+
+def main():
+
+    with open("../vscode/package.json") as file:
+
+        data = json.load(file)
+
+        version = data["version"]
+
+        with open("VERSION", "w") as versionFile:
+            versionFile.write(version)
+
+
+if __name__ == "__main__":
+    main()

integration/schema-language-server/clients/vscode/package.json

@@ -4,7 +4,7 @@
   "description": "Support for Vespa schema files.",
   "author": "Vespa",
   "publisher": "vespaai",
-  "version": "0.0.0",
+  "version": "2.0.0",
   "engines": {
     "vscode": "^1.72.0"
   },