Skip to content

Commit 27fad39

Browse files
jfaltermeierjfaltermeier
committed
Update CDT Cloud Blueprint to 1.61.x
2 parents 3e48a15 + e59df87 commit 27fad39

File tree

24 files changed

+5046
-4075
lines changed

24 files changed

+5046
-4075
lines changed

‎.github/workflows/build.yml‎

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ on:
99
branches:
1010
- master
1111
schedule:
12-
- cron: '0 4 * * *' # Runs every day at 4am: https://docs.github.com/en/actions/reference/events-that-trigger-workflows#scheduled-events-schedule
12+
- cron: '0 4 * * 0'
13+
1314

1415
jobs:
1516

@@ -19,7 +20,7 @@ jobs:
1920
strategy:
2021
fail-fast: false
2122
matrix:
22-
os: [windows-2019, ubuntu-22.04, macos-13]
23+
os: [windows-2022, ubuntu-22.04, macos-13, macos-14] # macOS-13 is for x64, macOS-14 is for arm64
2324
node: ['20.x']
2425

2526
runs-on: ${{ matrix.os }}
@@ -42,7 +43,8 @@ jobs:
4243
with:
4344
python-version: '3.11'
4445

45-
- name: Build and package
46+
- name: Build and package (Windows, Linux)
47+
if: runner.os == 'Windows' || runner.os == 'Linux'
4648
shell: bash
4749
run: |
4850
yarn --skip-integrity-check --network-timeout 100000
@@ -53,6 +55,36 @@ jobs:
5355
NODE_OPTIONS: --max_old_space_size=4096
5456
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # https://github.com/microsoft/vscode-ripgrep/issues/9
5557

58+
- name: Update electron-builder.yml for macOS-14
59+
if: matrix.os == 'macos-14'
60+
run: |
61+
sed -i '' 's|https://download.eclipse.org/theia/cdt-cloud/latest/macos|https://download.eclipse.org/theia/cdt-cloud/latest/macos-arm|g' applications/electron/electron-builder.yml
62+
63+
- name: Build and package (Mac)
64+
if: runner.os == 'macOS'
65+
shell: bash
66+
run: |
67+
yarn --skip-integrity-check --network-timeout 100000
68+
yarn build:extensions
69+
yarn download:plugins
70+
yarn tracecompass-server:download
71+
yarn electron build
72+
yarn electron package
73+
env:
74+
NODE_OPTIONS: --max_old_space_size=4096
75+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # https://github.com/microsoft/vscode-ripgrep/issues/9
76+
77+
- name: Upload Mac Dist Files
78+
if: runner.os == 'macOS'
79+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 #4.6.1
80+
with:
81+
name: ${{ matrix.os == 'macos-13' && 'mac-x64' || matrix.os == 'macos-14' && 'mac-arm64'}}
82+
path: |
83+
applications/electron/dist/**
84+
!applications/electron/dist/mac/**
85+
!applications/electron/dist/mac-arm64/**
86+
retention-days: 1
87+
5688
- name: Test (Linux)
5789
if: matrix.tests != 'skip' && runner.os == 'Linux'
5890
uses: GabrielBB/xvfb-action@86d97bde4a65fe9b290c0b3fb92c2c4ed0e5302d #1.6

‎.vscode/launch.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"type": "node",
4848
"request": "launch",
4949
"name": "Launch Browser Backend",
50-
"program": "${workspaceFolder}/applications/browser/src-gen/backend/main.js",
50+
"program": "${workspaceFolder}/applications/browser/lib/backend/main.js",
5151
"args": [
5252
"--hostname=0.0.0.0",
5353
"--port=3000",
@@ -90,7 +90,7 @@
9090
"type": "node",
9191
"request": "launch",
9292
"name": "Launch Browser Backend (eclipse.jdt.ls)",
93-
"program": "${workspaceFolder}/applications/browser/src-gen/backend/main.js",
93+
"program": "${workspaceFolder}/applications/browser/lib/backend/main.js",
9494
"args": [
9595
"--log-level=debug",
9696
"--root-dir=${workspaceFolder}/../eclipse.jdt.ls/org.eclipse.jdt.ls.core",
@@ -151,7 +151,7 @@
151151
"type": "node",
152152
"request": "launch",
153153
"args": [
154-
"${workspaceFolder}/applications/browser/src-gen/backend/main.js",
154+
"${workspaceFolder}/applications/browser/lib/backend/main.js",
155155
"${workspaceFolder}/plugins/vscode-api-tests/testWorkspace",
156156
"--port",
157157
"3030",

‎.vscode/settings.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"[markdown]": {
3+
"editor.defaultFormatter": "davidanson.vscode-markdownlint"
4+
}
5+
}

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,5 @@ ENV USE_LOCAL_GIT=true
6262
USER theia
6363

6464
WORKDIR /home/theia/cdt-cloud-blueprint
65-
ENTRYPOINT [ "node", "/home/theia/cdt-cloud-blueprint/applications/docker/src-gen/backend/main.js", "/home/theia/cdt-cloud-blueprint/applications/docker/workspace" ]
65+
ENTRYPOINT [ "node", "/home/theia/cdt-cloud-blueprint/applications/docker/lib/backend/main.js", "/home/theia/cdt-cloud-blueprint/applications/docker/workspace" ]
6666
CMD [ "yarn docker start", "--hostname=0.0.0.0" ]

‎Jenkinsfile‎

Lines changed: 236 additions & 42 deletions
Large diffs are not rendered by default.

‎PUBLISHING.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Publishing
2+
3+
PRs will trigger a verification build that generates two zip files with mac artifacts.
4+
Download these zips and replace them in this pre-release: <https://github.com/eclipse-cdt-cloud/cdt-cloud-blueprint/releases> before triggering a Jenkins Build.
5+
These unsigned dmgs will be used as input for the Jenkins build: https://ci.eclipse.org/theia/job/TheiaCDTCloud/

‎applications/browser/package.json‎

Lines changed: 64 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"name": "cdt-cloud-blueprint-browser-app",
44
"description": "CDT Cloud Blueprint is a template for building custom web-based C/C++ tools",
55
"productName": "CDT Cloud Blueprint",
6-
"version": "1.58.500",
6+
"version": "1.61.1",
77
"license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0",
88
"author": {
99
"name": "CDT Cloud",
@@ -52,71 +52,72 @@
5252
}
5353
},
5454
"dependencies": {
55-
"@theia/ai-anthropic": "1.58.5",
56-
"@theia/ai-chat": "1.58.5",
57-
"@theia/ai-chat-ui": "1.58.5",
58-
"@theia/ai-code-completion": "1.58.5",
59-
"@theia/ai-core": "1.58.5",
60-
"@theia/ai-history": "1.58.5",
61-
"@theia/ai-huggingface": "1.58.5",
62-
"@theia/ai-llamafile": "1.58.5",
63-
"@theia/ai-mcp": "1.58.5",
64-
"@theia/ai-ollama": "1.58.5",
65-
"@theia/ai-openai": "1.58.5",
66-
"@theia/ai-scanoss": "1.58.5",
67-
"@theia/ai-terminal": "1.58.5",
68-
"@theia/ai-workspace-agent": "1.58.5",
69-
"@theia/bulk-edit": "1.58.5",
70-
"@theia/callhierarchy": "1.58.5",
71-
"@theia/collaboration": "1.58.5",
72-
"@theia/console": "1.58.5",
73-
"@theia/core": "1.58.5",
74-
"@theia/debug": "1.58.5",
75-
"@theia/dev-container": "1.58.5",
76-
"@theia/editor": "1.58.5",
77-
"@theia/editor-preview": "1.58.5",
78-
"@theia/external-terminal": "1.58.5",
79-
"@theia/file-search": "1.58.5",
80-
"@theia/filesystem": "1.58.5",
81-
"@theia/getting-started": "1.58.5",
82-
"@theia/keymaps": "1.58.5",
83-
"@theia/markers": "1.58.5",
84-
"@theia/memory-inspector": "1.58.5",
85-
"@theia/messages": "1.58.5",
86-
"@theia/metrics": "1.58.5",
87-
"@theia/mini-browser": "1.58.5",
88-
"@theia/monaco": "1.58.5",
89-
"@theia/navigator": "1.58.5",
90-
"@theia/outline-view": "1.58.5",
91-
"@theia/output": "1.58.5",
92-
"@theia/plugin-dev": "1.58.5",
93-
"@theia/plugin-ext": "1.58.5",
94-
"@theia/plugin-ext-vscode": "1.58.5",
95-
"@theia/preferences": "1.58.5",
96-
"@theia/process": "1.58.5",
97-
"@theia/property-view": "1.58.5",
98-
"@theia/remote": "1.58.5",
99-
"@theia/scm": "1.58.5",
100-
"@theia/search-in-workspace": "1.58.5",
101-
"@theia/secondary-window": "1.58.5",
102-
"@theia/task": "1.58.5",
103-
"@theia/terminal": "1.58.5",
104-
"@theia/timeline": "1.58.5",
105-
"@theia/toolbar": "1.58.5",
106-
"@theia/typehierarchy": "1.58.5",
107-
"@theia/userstorage": "1.58.5",
108-
"@theia/variable-resolver": "1.58.5",
109-
"@theia/vsx-registry": "1.58.5",
110-
"@theia/workspace": "1.58.5",
55+
"@theia/ai-anthropic": "1.61.1",
56+
"@theia/ai-chat": "1.61.1",
57+
"@theia/ai-chat-ui": "1.61.1",
58+
"@theia/ai-code-completion": "1.61.1",
59+
"@theia/ai-core": "1.61.1",
60+
"@theia/ai-google": "1.61.1",
61+
"@theia/ai-history": "1.61.1",
62+
"@theia/ai-huggingface": "1.61.1",
63+
"@theia/ai-ide": "1.61.1",
64+
"@theia/ai-llamafile": "1.61.1",
65+
"@theia/ai-mcp": "1.61.1",
66+
"@theia/ai-ollama": "1.61.1",
67+
"@theia/ai-openai": "1.61.1",
68+
"@theia/ai-scanoss": "1.61.1",
69+
"@theia/ai-terminal": "1.61.1",
70+
"@theia/bulk-edit": "1.61.1",
71+
"@theia/callhierarchy": "1.61.1",
72+
"@theia/collaboration": "1.61.1",
73+
"@theia/console": "1.61.1",
74+
"@theia/core": "1.61.1",
75+
"@theia/debug": "1.61.1",
76+
"@theia/dev-container": "1.61.1",
77+
"@theia/editor": "1.61.1",
78+
"@theia/editor-preview": "1.61.1",
79+
"@theia/external-terminal": "1.61.1",
80+
"@theia/file-search": "1.61.1",
81+
"@theia/filesystem": "1.61.1",
82+
"@theia/getting-started": "1.61.1",
83+
"@theia/keymaps": "1.61.1",
84+
"@theia/markers": "1.61.1",
85+
"@theia/memory-inspector": "1.61.1",
86+
"@theia/messages": "1.61.1",
87+
"@theia/metrics": "1.61.1",
88+
"@theia/mini-browser": "1.61.1",
89+
"@theia/monaco": "1.61.1",
90+
"@theia/navigator": "1.61.1",
91+
"@theia/outline-view": "1.61.1",
92+
"@theia/output": "1.61.1",
93+
"@theia/plugin-dev": "1.61.1",
94+
"@theia/plugin-ext": "1.61.1",
95+
"@theia/plugin-ext-vscode": "1.61.1",
96+
"@theia/preferences": "1.61.1",
97+
"@theia/process": "1.61.1",
98+
"@theia/property-view": "1.61.1",
99+
"@theia/remote": "1.61.1",
100+
"@theia/scm": "1.61.1",
101+
"@theia/search-in-workspace": "1.61.1",
102+
"@theia/secondary-window": "1.61.1",
103+
"@theia/task": "1.61.1",
104+
"@theia/terminal": "1.61.1",
105+
"@theia/timeline": "1.61.1",
106+
"@theia/toolbar": "1.61.1",
107+
"@theia/typehierarchy": "1.61.1",
108+
"@theia/userstorage": "1.61.1",
109+
"@theia/variable-resolver": "1.61.1",
110+
"@theia/vsx-registry": "1.61.1",
111+
"@theia/workspace": "1.61.1",
111112
"fs-extra": "^9.0.1",
112-
"cdt-cloud-blueprint-updater-ext": "1.58.500",
113-
"cdt-cloud-blueprint-product-ext": "1.58.500",
114-
"theia-traceviewer": "0.7.3",
115-
"@eclipse-cdt-cloud/blueprint-examples": "1.58.500"
113+
"cdt-cloud-blueprint-updater-ext": "1.61.1",
114+
"cdt-cloud-blueprint-product-ext": "1.61.1",
115+
"theia-traceviewer": "0.9.0",
116+
"@eclipse-cdt-cloud/blueprint-examples": "1.61.1"
116117
},
117118
"devDependencies": {
118-
"@theia/cli": "1.58.5",
119-
"@theia/native-webpack-plugin": "1.58.5"
119+
"@theia/cli": "1.61.1",
120+
"@theia/native-webpack-plugin": "1.61.1"
120121
},
121122
"scripts": {
122123
"clean": "theia clean && rimraf node_modules",

‎applications/docker/package.json‎

Lines changed: 63 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"name": "cdt-cloud-blueprint-docker-app",
44
"description": "CDT Cloud Blueprint is a template for building custom web-based C/C++ tools",
55
"productName": "CDT Cloud Blueprint",
6-
"version": "1.58.500",
6+
"version": "1.61.1",
77
"license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0",
88
"author": {
99
"name": "CDT Cloud",
@@ -41,64 +41,71 @@
4141
}
4242
},
4343
"dependencies": {
44-
"@theia/ai-chat": "1.58.5",
45-
"@theia/ai-chat-ui": "1.58.5",
46-
"@theia/ai-code-completion": "1.58.5",
47-
"@theia/ai-core": "1.58.5",
48-
"@theia/ai-history": "1.58.5",
49-
"@theia/ai-llamafile": "1.58.5",
50-
"@theia/ai-ollama": "1.58.5",
51-
"@theia/ai-openai": "1.58.5",
52-
"@theia/ai-terminal": "1.58.5",
53-
"@theia/ai-workspace-agent": "1.58.5",
54-
"@theia/bulk-edit": "1.58.5",
55-
"@theia/callhierarchy": "1.58.5",
56-
"@theia/console": "1.58.5",
57-
"@theia/core": "1.58.5",
58-
"@theia/debug": "1.58.5",
59-
"@theia/dev-container": "1.58.5",
60-
"@theia/editor": "1.58.5",
61-
"@theia/editor-preview": "1.58.5",
62-
"@theia/external-terminal": "1.58.5",
63-
"@theia/file-search": "1.58.5",
64-
"@theia/filesystem": "1.58.5",
65-
"@theia/getting-started": "1.58.5",
66-
"@theia/keymaps": "1.58.5",
67-
"@theia/markers": "1.58.5",
68-
"@theia/memory-inspector": "1.58.5",
69-
"@theia/messages": "1.58.5",
70-
"@theia/metrics": "1.58.5",
71-
"@theia/mini-browser": "1.58.5",
72-
"@theia/monaco": "1.58.5",
73-
"@theia/navigator": "1.58.5",
74-
"@theia/outline-view": "1.58.5",
75-
"@theia/output": "1.58.5",
76-
"@theia/plugin-dev": "1.58.5",
77-
"@theia/plugin-ext": "1.58.5",
78-
"@theia/plugin-ext-vscode": "1.58.5",
79-
"@theia/preferences": "1.58.5",
80-
"@theia/process": "1.58.5",
81-
"@theia/property-view": "1.58.5",
82-
"@theia/scm": "1.58.5",
83-
"@theia/search-in-workspace": "1.58.5",
84-
"@theia/secondary-window": "1.58.5",
85-
"@theia/task": "1.58.5",
86-
"@theia/terminal": "1.58.5",
87-
"@theia/timeline": "1.58.5",
88-
"@theia/toolbar": "1.58.5",
89-
"@theia/typehierarchy": "1.58.5",
90-
"@theia/userstorage": "1.58.5",
91-
"@theia/variable-resolver": "1.58.5",
92-
"@theia/vsx-registry": "1.58.5",
93-
"@theia/workspace": "1.58.5",
44+
"@theia/ai-anthropic": "1.61.1",
45+
"@theia/ai-chat": "1.61.1",
46+
"@theia/ai-chat-ui": "1.61.1",
47+
"@theia/ai-code-completion": "1.61.1",
48+
"@theia/ai-core": "1.61.1",
49+
"@theia/ai-google": "1.61.1",
50+
"@theia/ai-history": "1.61.1",
51+
"@theia/ai-huggingface": "1.61.1",
52+
"@theia/ai-ide": "1.61.1",
53+
"@theia/ai-llamafile": "1.61.1",
54+
"@theia/ai-mcp": "1.61.1",
55+
"@theia/ai-ollama": "1.61.1",
56+
"@theia/ai-openai": "1.61.1",
57+
"@theia/ai-scanoss": "1.61.1",
58+
"@theia/ai-terminal": "1.61.1",
59+
"@theia/bulk-edit": "1.61.1",
60+
"@theia/callhierarchy": "1.61.1",
61+
"@theia/collaboration": "1.61.1",
62+
"@theia/console": "1.61.1",
63+
"@theia/core": "1.61.1",
64+
"@theia/debug": "1.61.1",
65+
"@theia/dev-container": "1.61.1",
66+
"@theia/editor": "1.61.1",
67+
"@theia/editor-preview": "1.61.1",
68+
"@theia/external-terminal": "1.61.1",
69+
"@theia/file-search": "1.61.1",
70+
"@theia/filesystem": "1.61.1",
71+
"@theia/getting-started": "1.61.1",
72+
"@theia/keymaps": "1.61.1",
73+
"@theia/markers": "1.61.1",
74+
"@theia/memory-inspector": "1.61.1",
75+
"@theia/messages": "1.61.1",
76+
"@theia/metrics": "1.61.1",
77+
"@theia/mini-browser": "1.61.1",
78+
"@theia/monaco": "1.61.1",
79+
"@theia/navigator": "1.61.1",
80+
"@theia/outline-view": "1.61.1",
81+
"@theia/output": "1.61.1",
82+
"@theia/plugin-dev": "1.61.1",
83+
"@theia/plugin-ext": "1.61.1",
84+
"@theia/plugin-ext-vscode": "1.61.1",
85+
"@theia/preferences": "1.61.1",
86+
"@theia/process": "1.61.1",
87+
"@theia/property-view": "1.61.1",
88+
"@theia/remote": "1.61.1",
89+
"@theia/scm": "1.61.1",
90+
"@theia/search-in-workspace": "1.61.1",
91+
"@theia/secondary-window": "1.61.1",
92+
"@theia/task": "1.61.1",
93+
"@theia/terminal": "1.61.1",
94+
"@theia/timeline": "1.61.1",
95+
"@theia/toolbar": "1.61.1",
96+
"@theia/typehierarchy": "1.61.1",
97+
"@theia/userstorage": "1.61.1",
98+
"@theia/variable-resolver": "1.61.1",
99+
"@theia/vsx-registry": "1.61.1",
100+
"@theia/workspace": "1.61.1",
94101
"fs-extra": "^9.0.1",
95-
"cdt-cloud-blueprint-updater-ext": "1.58.500",
96-
"cdt-cloud-blueprint-product-ext": "1.58.500",
97-
"theia-traceviewer": "0.7.3",
98-
"@eclipse-cdt-cloud/blueprint-examples": "1.58.500"
102+
"cdt-cloud-blueprint-updater-ext": "1.61.1",
103+
"cdt-cloud-blueprint-product-ext": "1.61.1",
104+
"theia-traceviewer": "0.9.0",
105+
"@eclipse-cdt-cloud/blueprint-examples": "1.61.1"
99106
},
100107
"devDependencies": {
101-
"@theia/cli": "1.58.5"
108+
"@theia/cli": "1.61.1"
102109
},
103110
"scripts": {
104111
"clean": "theia clean && rimraf node_modules",

0 commit comments

Comments
 (0)