Skip to content

Commit e61c4bf

Browse files
authored
Merge branch 'main' into frank/update-cahneg-log
2 parents e04334c + 1bc6805 commit e61c4bf

File tree

11 files changed

+5543
-1638
lines changed

11 files changed

+5543
-1638
lines changed

.azure-pipelines/rc.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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:

.github/workflows/linuxUI.yml

Lines changed: 5 additions & 4 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,20 +22,21 @@ 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

.github/workflows/windowsUI.yml

Lines changed: 5 additions & 4 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

0 commit comments

Comments
 (0)