From 9bfd8a89b7f2259757999443adda0d5a7a505cc8 Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber@redhat.com>
Date: Wed, 3 Apr 2024 15:58:05 -0400
Subject: [PATCH] Fix tests in release workflow.

- JDT-LS should be in place before tests run

Signed-off-by: Roland Grunberg <rgrunber@redhat.com>
---
 .github/workflows/release.yml | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7ebfabbbb..22ac10cdf 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -105,14 +105,21 @@ jobs:
       - name: Build vscode-java
         run: |
           npm install
-          npm run vscode:prepublish
-          npm run compile
+      - name: Prepare JDT-LS
+        run: |
+          rm -rf ./out
+          mkdir server/
+          if [ -e jdt-language-server-*.tar.gz ]; then
+            tar -xf jdt-language-server-*.tar.gz -C server/
+          else
+            tar -xf ../staging/jdt-language-server-*.tar.gz -C server/
+          fi
+          echo "EXT_VERSION=$(cat package.json | jq -r .version)" >> $GITHUB_ENV
       - name: Test vscode-java
         env:
           SKIP_COMMANDS_TEST: true
-          SKIP_CLASSPATH_TEST: true
         run: |
-          $(echo "xvfb-run --auto-servernum") npm run test --silent
+          xvfb-run --auto-servernum npm run test --silent
         continue-on-error: true
       - name: Clean tests
         run: npx gulp clean_test_folder
@@ -124,16 +131,6 @@ jobs:
         run: |
           npx gulp prepare_pre_release
           echo "publishPreReleaseFlag=--pre-release" >> $GITHUB_ENV
-      - name: Prepare JDT-LS
-        run: |
-          rm -rf ./out
-          mkdir server/
-          if [ -e jdt-language-server-*.tar.gz ]; then
-            tar -xf jdt-language-server-*.tar.gz -C server/
-          else
-            tar -xf ../staging/jdt-language-server-*.tar.gz -C server/
-          fi
-          echo "EXT_VERSION=$(cat package.json | jq -r .version)" >> $GITHUB_ENV
       - name: Package vscode-java
         run: |
           platforms=("win32-x64" "linux-x64" "linux-arm64" "darwin-x64" "darwin-arm64")