Skip to content

Commit 863f765

Browse files
chagongchagong
authored
Merge branch 'main' into fix/get-notified-on-servermode-changes
2 parents e513619 + cdd189c commit 863f765

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+7946
-1830
lines changed

‎.azure-pipelines/nightly.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ extends:
2020
template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
2121
parameters:
2222
pool:
23-
name: VSEngSS-MicroBuild2022-1ES
23+
name: VSEng-MicroBuildVSStable
2424
settings:
2525
networkIsolationPolicy: Permissive
2626
stages:

‎.azure-pipelines/rc.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ extends:
1515
template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
1616
parameters:
1717
pool:
18-
name: VSEngSS-MicroBuild2022-1ES
18+
name: VSEng-MicroBuildVSStable
1919
settings:
2020
networkIsolationPolicy: Permissive
2121
stages:
@@ -88,6 +88,13 @@ extends:
8888
displayName: Replace AI Key
8989
inputs:
9090
script: npx json@9.0.6 -I -f package.json -e "this.aiKey=\"%AI_KEY%\""
91+
- task: PowerShell@2
92+
displayName: Update package.json for stable
93+
inputs:
94+
targetType: inline
95+
script: |-
96+
node ./scripts/prepare-stable-build.js
97+
Move-Item -Path "./package.stable.json" -Destination "./package.json" -Force
9198
- task: CmdLine@2
9299
displayName: vsce package
93100
inputs:

‎.azure-pipelines/release-nightly.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,4 @@ extends:
5252
azureSubscription: 'VSCode-Ext-Publishing'
5353
scriptType: pscore
5454
scriptLocation: inlineScript
55-
inlineScript: 'npx @vscode/vsce@latest publish -i ''$(Build.SourcesDirectory)/extension.vsix'' --manifestPath ''$(Build.SourcesDirectory)/extension.manifest'' --signaturePath ''$(Build.SourcesDirectory)/extension.signature.p7s'' --azure-credential'
55+
inlineScript: 'npx @vscode/vsce@latest publish -i ''$(Build.SourcesDirectory)/extension.vsix'' --manifestPath ''$(Build.SourcesDirectory)/extension.manifest'' --signaturePath ''$(Build.SourcesDirectory)/extension.signature.p7s'' --allow-proposed-apis chatPromptFiles --azure-credential'

‎.azure-pipelines/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,4 @@ extends:
5252
azureSubscription: 'VSCode-Ext-Publishing'
5353
scriptType: pscore
5454
scriptLocation: inlineScript
55-
inlineScript: 'npx @vscode/vsce@latest publish -i ''$(Build.SourcesDirectory)/extension.vsix'' --manifestPath ''$(Build.SourcesDirectory)/extension.manifest'' --signaturePath ''$(Build.SourcesDirectory)/extension.signature.p7s'' --azure-credential'
55+
inlineScript: 'npx @vscode/vsce@latest publish -i ''$(Build.SourcesDirectory)/extension.vsix'' --manifestPath ''$(Build.SourcesDirectory)/extension.manifest'' --signaturePath ''$(Build.SourcesDirectory)/extension.signature.p7s'' --allow-proposed-apis chatPromptFiles --azure-credential'

‎.github/workflows/linuxUI.yml‎

Lines changed: 14 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
timeout-minutes: 30
1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v4
1616

1717
- name: Setup Build Environment
1818
run: |
@@ -22,56 +22,35 @@ jobs:
2222
sleep 3
2323
2424
- name: Set up JDK 21
25-
uses: actions/setup-java@v1
25+
uses: actions/setup-java@v4
2626
with:
2727
java-version: '21'
28+
distribution: 'temurin'
2829

2930
- name: Setup Node.js environment
30-
uses: actions/setup-node@v2
31+
uses: actions/setup-node@v4
3132
with:
3233
node-version: 20
3334

3435
- name: Install Node.js modules
3536
run: npm install
3637

3738
- name: Install VSCE
38-
run: npm install -g vsce
39+
run: npm install -g @vscode/vsce
3940

4041
- name: Build OSGi bundle
4142
run: npm run build-server
4243

4344
- name: Build VSIX file
4445
run: vsce package
4546

46-
- name: UI Test
47-
continue-on-error: true
48-
id: test
49-
run: DISPLAY=:99 npm run test-ui
47+
- name: E2E Test (Playwright)
48+
run: DISPLAY=:99 npm run test-e2e
5049

51-
- name: Retry UI Test 1
52-
continue-on-error: true
53-
if: steps.test.outcome=='failure'
54-
id: retry1
55-
run: |
56-
git reset --hard
57-
git clean -fd
58-
DISPLAY=:99 npm run test-ui
59-
60-
- name: Retry UI Test 2
61-
continue-on-error: true
62-
if: steps.retry1.outcome=='failure'
63-
id: retry2
64-
run: |
65-
git reset --hard
66-
git clean -fd
67-
DISPLAY=:99 npm run test-ui
68-
69-
- name: Set test status
70-
if: ${{ steps.test.outcome=='failure' && steps.retry1.outcome=='failure' && steps.retry2.outcome=='failure' }}
71-
run: |
72-
echo "Tests failed"
73-
exit 1
74-
75-
- name: Print language server Log
76-
if: ${{ failure() }}
77-
run: find ./test-resources/settings/User/workspaceStorage/*/redhat.java/jdt_ws/.metadata/.log -print -exec cat '{}' \;;
50+
- name: Upload test results
51+
if: ${{ always() }}
52+
uses: actions/upload-artifact@v4
53+
with:
54+
name: e2e-results-linux
55+
path: test-results/
56+
retention-days: 7

‎.github/workflows/windowsUI.yml‎

Lines changed: 14 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,24 @@ jobs:
1212
runs-on: windows-latest
1313
timeout-minutes: 30
1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v4
1616

1717
- name: Set up JDK 21
18-
uses: actions/setup-java@v1
18+
uses: actions/setup-java@v4
1919
with:
2020
java-version: '21'
21+
distribution: 'temurin'
2122

2223
- name: Setup Node.js environment
23-
uses: actions/setup-node@v2
24+
uses: actions/setup-node@v4
2425
with:
2526
node-version: 20
2627

2728
- name: Install Node.js modules
2829
run: npm install
2930

3031
- name: Install VSCE
31-
run: npm install -g vsce
32+
run: npm install -g @vscode/vsce
3233

3334
- name: Lint
3435
run: npm run tslint
@@ -43,35 +44,13 @@ jobs:
4344
- name: Build VSIX file
4445
run: vsce package
4546

46-
- name: UI Test
47-
continue-on-error: true
48-
id: test
49-
run: npm run test-ui
47+
- name: E2E Test (Playwright)
48+
run: npm run test-e2e
5049

51-
- name: Retry UI Test 1
52-
continue-on-error: true
53-
if: steps.test.outcome=='failure'
54-
id: retry1
55-
run: |
56-
git reset --hard
57-
git clean -fd
58-
npm run test-ui
59-
60-
- name: Retry UI Test 2
61-
continue-on-error: true
62-
if: steps.retry1.outcome=='failure'
63-
id: retry2
64-
run: |
65-
git reset --hard
66-
git clean -fd
67-
npm run test-ui
68-
69-
- name: Set test status
70-
if: ${{ steps.test.outcome=='failure' && steps.retry1.outcome=='failure' && steps.retry2.outcome=='failure' }}
71-
run: |
72-
echo "Tests failed"
73-
exit 1
74-
75-
- name: Print language server Log if job failed
76-
if: ${{ failure() }}
77-
run: Get-ChildItem -Path ./test-resources/settings/User/workspaceStorage/*/redhat.java/jdt_ws/.metadata/.log | cat
50+
- name: Upload test results
51+
if: ${{ always() }}
52+
uses: actions/upload-artifact@v4
53+
with:
54+
name: e2e-results-windows
55+
path: test-results/
56+
retention-days: 7

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to the "vscode-java-dependency" extension will be documented
44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

7+
## 0.27.1
8+
9+
- Enhancement - Update upgrade prompt after merging extension in https://github.com/microsoft/vscode-java-dependency/pull/971
10+
711
## 0.27.0
812

913
- feat - Add CVE checking to notify users to fix the critical/high-severity CVE issues in https://github.com/microsoft/vscode-java-dependency/pull/948

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ You can tell that the glob pattern is supported. And here's more - you can incl
5757

5858
## Requirements
5959

60-
- VS Code (version 1.83.1+)
60+
- VS Code (version 1.95.0+)
6161
- [Language Support for Java by Red Hat](https://marketplace.visualstudio.com/items?itemName=redhat.java)
6262

6363

‎jdtls.ext/com.microsoft.jdtls.ext.core/plugin.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<command id="java.project.checkImportStatus" />
1313
<command id="java.project.getImportClassContent" />
1414
<command id="java.project.getDependencies" />
15+
<command id="java.project.getFileImports" />
1516
</delegateCommandHandler>
1617
</extension>
1718
<extension

0 commit comments

Comments
 (0)