Fix workflows

Author: guw

.github/workflows/ci.yml

@@ -65,7 +65,7 @@ jobs:
           path: ./bundles/com.salesforce.bazel.sdk/aspects/aspects*.zip
           key: ${{ runner.os }}-aspects-${{ hashFiles('**/aspects/import/import-and-build.sh', '**/aspects/import/MODULE.bazel*') }}
 
-      - name: Cache  Bazel repository cache
+      - name: Cache Bazel repository cache
         uses: actions/cache@v4
         with:
           path: |
@@ -80,8 +80,9 @@ jobs:
       - name: Setup Node version
         uses: actions/setup-node@v6
         with:
-          node-version: 22
           cache: 'npm'
+          cache-dependency-path: 'vscode/package-lock.json'
+          node-version-file: 'vscode/package.json'
 
       - name: Print Maven toolchains.xml
         shell: bash
@@ -92,7 +93,7 @@ jobs:
         shell: bash
         run: ./import-and-build.sh
 
-      - name: Build and Test Eclipse & JDTLS PLug-in
+      - name: Build and Test Eclipse & JDTLS Plug-ins
         uses: coactions/setup-xvfb@v1
         env:
           BUILD_ID: "${{ steps.time.outputs.time }}"
@@ -101,6 +102,13 @@ jobs:
         with:
           run: ./mvnw --batch-mode --no-transfer-progress --strict-checksums --fail-at-end -update-snapshots --show-version --errors clean verify
 
+      - name: Upload Maven Test Results
+        uses: actions/upload-artifact@v5
+        if: always()
+        with:
+          name: test-results-maven-${{ matrix.os }}
+          path: tests/**/target/surefire-reports/*.xml
+
       - name: Install Node dependencies
         working-directory: ./vscode
         run: npm ci
@@ -113,23 +121,21 @@ jobs:
           BUILD_LABEL: "CI ${{ steps.time.outputs.time }} (${{ steps.branch_name.outputs.branch }})"
         run: npm run build
 
-      - name: Run VS Code Extenion Tests
+      - name: Run VS Code Extension Tests
         uses: GabrielBB/xvfb-action@v1.7
-        working-directory: ./vscode
         env:
           PRINT_JDTLS_LOGS: true
         with:
           run: npm run test
+          working-directory: ./vscode
           options: "-screen 0 1600x1200x24"
 
-      - name: Upload Test Results
-        uses: actions/upload-artifact@v4
+      - name: Upload VS Code Test Results
+        uses: actions/upload-artifact@v5
         if: always()
         with:
-          name: test-results-${{ matrix.os }}
-          path: 
+          name: test-results-vscode-${{ matrix.os }}
           path: |
-            tests/**/target/surefire-reports/*.xml
             vscode/test/**/*.xml
             vscode/test/**/*.json
             !vscode/test/**/tsconfig.json
@@ -146,15 +152,15 @@ jobs:
             vscode/test/logs
 
       - name: Upload p2 Repository
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: success() && matrix.os == 'ubuntu-latest'
         with:
           name: p2-repository
           path: releng/p2repository/target/repository/
           if-no-files-found: error
 
       - name: Upload JDTLS Products
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: success() && matrix.os == 'ubuntu-latest'
         with:
           name: jdt-bazel-ls
@@ -164,7 +170,7 @@ jobs:
           if-no-files-found: error
 
       - name: Upload SCIPLS Products
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: success() && matrix.os == 'ubuntu-latest'
         with:
           name: scip-bazel-ls
@@ -188,7 +194,7 @@ jobs:
     # needed for publishing test results from forks
     steps:
       - name: Upload
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: ci-event-file
           path: ${{ github.event_path }}

.github/workflows/publish-vscode-extension.yml

@@ -30,6 +30,15 @@ jobs:
     name: Publish Latest VS Code Extension
     runs-on: ubuntu-latest
 
+    # we are very restrictive when this runs, i.e. only on main, only on success and only with the bazel-eclipse repository (not on forks)
+    if: >
+      ( !github.event.workflow_run ||
+        ( github.event.workflow_run.conclusion == 'success' && 
+          github.event.workflow_run.event != 'pull_request' )
+      ) &&
+      github.repository == 'eclipseguru/bazel-eclipse' && 
+      github.ref == 'refs/heads/main'
+      
     steps:
       - name: Checkout
         uses: actions/checkout@v5
@@ -47,8 +56,9 @@ jobs:
       - name: Setup Node version
         uses: actions/setup-node@v6
         with:
-          node-version: 22
           cache: 'npm'
+          cache-dependency-path: 'vscode/package-lock.json'
+          node-version-file: 'vscode/package.json'
 
       - name: 📦 Install dependencies
         run: |

vscode/package.json

@@ -9,7 +9,8 @@
 	"bugs": "https://github.com/eclipseguru/bazel-eclipse/issues",
 	"preview": true,
 	"engines": {
-		"vscode": "^1.80.0"
+		"node": "^22.20.0",
+		"vscode": "^1.106.0"
 	},
 	"repository": {
 		"type": "git",

vscode/scripts/server.mjs

@@ -86,9 +86,13 @@ async function buildServer() {
     fs.ensureDirSync('./server');
 
     try {
-        const command = `${mvnw()}  clean package -DskipTests=true`;
-        console.log(`Executing: ${command}`);
-        execSync(command, { cwd: serverDir, stdio: [0, 1, 2] });
+        const jdtlsJars = await glob(`${serverDir}/releng/p2repository/target/repository/plugins/com.salesforce.bazel.eclipse.jdtls_*.jar`);
+        if(jdtlsJars.length != 1) {
+            console.log('Building Bazel JDT Language Server extension from source...');
+            const command = `${mvnw()}  clean package -DskipTests=true`;
+            console.log(`Executing: ${command}`);
+            execSync(command, { cwd: serverDir, stdio: [0, 1, 2] });
+        }
 
         const sources = await glob(`${serverDir}/releng/p2repository/target/repository/plugins/*.jar`);