Skip to content

Commit 9bfd8a8

Browse files
committed
Fix tests in release workflow.
- JDT-LS should be in place before tests run Signed-off-by: Roland Grunberg <rgrunber@redhat.com>
1 parent 29c95b8 commit 9bfd8a8

1 file changed

Lines changed: 11 additions & 14 deletions

File tree

.github/workflows/release.yml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,21 @@ jobs:
105105
- name: Build vscode-java
106106
run: |
107107
npm install
108-
npm run vscode:prepublish
109-
npm run compile
108+
- name: Prepare JDT-LS
109+
run: |
110+
rm -rf ./out
111+
mkdir server/
112+
if [ -e jdt-language-server-*.tar.gz ]; then
113+
tar -xf jdt-language-server-*.tar.gz -C server/
114+
else
115+
tar -xf ../staging/jdt-language-server-*.tar.gz -C server/
116+
fi
117+
echo "EXT_VERSION=$(cat package.json | jq -r .version)" >> $GITHUB_ENV
110118
- name: Test vscode-java
111119
env:
112120
SKIP_COMMANDS_TEST: true
113-
SKIP_CLASSPATH_TEST: true
114121
run: |
115-
$(echo "xvfb-run --auto-servernum") npm run test --silent
122+
xvfb-run --auto-servernum npm run test --silent
116123
continue-on-error: true
117124
- name: Clean tests
118125
run: npx gulp clean_test_folder
@@ -124,16 +131,6 @@ jobs:
124131
run: |
125132
npx gulp prepare_pre_release
126133
echo "publishPreReleaseFlag=--pre-release" >> $GITHUB_ENV
127-
- name: Prepare JDT-LS
128-
run: |
129-
rm -rf ./out
130-
mkdir server/
131-
if [ -e jdt-language-server-*.tar.gz ]; then
132-
tar -xf jdt-language-server-*.tar.gz -C server/
133-
else
134-
tar -xf ../staging/jdt-language-server-*.tar.gz -C server/
135-
fi
136-
echo "EXT_VERSION=$(cat package.json | jq -r .version)" >> $GITHUB_ENV
137134
- name: Package vscode-java
138135
run: |
139136
platforms=("win32-x64" "linux-x64" "linux-arm64" "darwin-x64" "darwin-arm64")

0 commit comments

Comments
 (0)