Skip to content

Commit cd3f74c

Browse files
committed
bump github action node version
1 parent eee28c7 commit cd3f74c

File tree

7 files changed

+1332
-222
lines changed

7 files changed

+1332
-222
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
- name: Setup Node version
7878
uses: actions/setup-node@v4
7979
with:
80-
node-version: 16
80+
node-version: 22
8181
cache: 'npm'
8282

8383
- name: 📦 Install dependencies
@@ -91,7 +91,7 @@ jobs:
9191
run: npm run build
9292

9393
- name: 🧪 Run tests
94-
uses: GabrielBB/xvfb-action@v1
94+
uses: GabrielBB/xvfb-action@v1.7
9595
env:
9696
PRINT_JDTLS_LOGS: true
9797
with:

.vscode-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ module.exports = defineConfig([
77
workspaceFolder: 'test/projects/small',
88
files: 'out/test/**/*.test.js'
99
}
10-
]);
10+
]);

package-lock.json

+53-53
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/projects/small/.vscode/settings.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
"bazel-out": false,
1717
"bazel-small": false,
1818
"bazel-testlogs": false,
19-
".settings": false,
19+
".settings": true,
2020
"tools": false,
21-
"bin": false,
22-
".bazelbsp": false,
23-
".idea": false,
24-
".ijwb": false
21+
"bin": false
2522
},
2623
"java.bazel.log.level": "trace",
2724
"java.showBuildStatusOnStart.enabled": "terminal",
25+
"java.debug.logLevel": "verbose",
26+
"java.trace.server": "verbose",
2827
"java.server.launchMode": "Standard",
28+
"java.transport": "stdio",
2929
"java.import.generatesMetadataFilesAtProjectRoot": false,
3030
"java.autobuild.enabled": true,
3131
"bazel.projectview.open": false,
@@ -37,4 +37,4 @@
3737
},
3838
"editor.formatOnSave": true,
3939
"bazel.buildifier.enable": true
40-
}
40+
}

test/projects/small/MODULE.bazel.lock

+1,255-142
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/runTest.ts

+4-8
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,10 @@ async function main() {
3737
resolveCliArgsFromVSCodeExecutablePath(vscodeExecutablePath);
3838

3939
// span vs code process for custom setup
40-
cp.spawnSync(
41-
cliPath,
42-
[...args, '--install-extension', 'redhat.java@prerelease'],
43-
{
44-
encoding: 'utf-8',
45-
stdio: 'inherit',
46-
}
47-
);
40+
cp.spawnSync(cliPath, [...args, '--install-extension', 'redhat.java'], {
41+
encoding: 'utf-8',
42+
stdio: 'inherit',
43+
});
4844

4945
// ensrue the user data area is empty
5046
if (fs.existsSync(testUserDataPath)) {

test/suite/extension.test.ts

+11-10
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { setTimeout } from 'node:timers/promises';
33
import { env } from 'process';
44
import * as vscode from 'vscode';
55
import { Commands } from '../../src/commands';
6+
import { Jdtls } from './Jdtls';
67

78
suite('Java Language Extension - Standard', () => {
89
test('RedHat Java Extension should be present', () => {
@@ -94,15 +95,15 @@ suite('Java Language Extension - Standard', () => {
9495
});
9596

9697
// this is currently broken for the `small` test project.
97-
// test('should build workspace without problems within reasonable time', function () {
98-
// this.timeout(60000 * 5);
99-
// return Jdtls.buildWorkspace().then((result) => {
100-
// assert.strictEqual(result, Jdtls.CompileWorkspaceStatus.Succeed);
98+
test('should build workspace without problems within reasonable time', function () {
99+
this.timeout(60000 * 5);
100+
return Jdtls.buildWorkspace().then((result) => {
101+
assert.strictEqual(result, Jdtls.CompileWorkspaceStatus.Succeed);
101102

102-
// return Jdtls.getSourcePaths().then((resp) => {
103-
// const projects = new Set(resp.data.map((p) => p.projectName));
104-
// assert.ok(projects.size > 0);
105-
// });
106-
// });
107-
// });
103+
return Jdtls.getSourcePaths().then((resp) => {
104+
const projects = new Set(resp.data.map((p) => p.projectName));
105+
assert.ok(projects.size > 0);
106+
});
107+
});
108+
});
108109
});

0 commit comments

Comments
 (0)