Merge branch 'interns/languageserver' of github.com:vespa-engine/vesp…

…a into interns/languageserver
vespa-engine · Aug 8, 2024 · 2329efc · 2329efc
2 parents d79c181 + c7ae629
commit 2329efc
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/.github/workflows/lspPublish.yml → .github/workflows/lspDeploy.yml b/.github/workflows/lspPublish.yml → .github/workflows/lspDeploy.yml
@@ -6,14 +6,18 @@ on:
       version:
         type: choice
         descirption: Which kind of release is this
+        required: true
         options:
           - major
           - minor
           - patch
+  push:
+    branches:
+      - interns/languageserver
 
 jobs:
 
-  deploy:
+  lspDeploy:
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -27,10 +31,11 @@ jobs:
           distribution: 'temurin'
           cache: maven
 
-      - run: export MAVEN_OPTS="-Xms128m -Xmx1024m"
-      - run: ./bootstrap.sh java
-        working-directory: ./
-      - run: mvn install --threads 1C
+      - name: Build Vespa
+        run: |
+          export MAVEN_OPTS="-Xms128m -Xmx1024m"
+          ./bootstrap.sh java
+          mvn install --threads 1C
         working-directory: ./
 
       - uses: actions/setup-node@v4

diff --git a/integration/schema-language-server/clients/vscode/package-lock.json b/integration/schema-language-server/clients/vscode/package-lock.json
diff --git a/integration/schema-language-server/clients/vscode/src/publish.ts b/integration/schema-language-server/clients/vscode/src/publish.ts
@@ -3,7 +3,12 @@ import { publishVSIX, createVSIX } from '@vscode/vsce';
 import * as actions from '@actions/core';
 
 async function publish(): Promise<void> {
-    const version = actions.getInput("version", { required: true });
+    let version = actions.getInput("version", { required: false, trimWhitespace: true });
+
+    if (version == "") {
+        version = "patch"
+    }
+
 
     await createVSIX({
         version: version