Skip to content

Commit

Permalink
Merge CDT.cloud Blueprint update (#52)
Browse files Browse the repository at this point in the history
- Update to Theia Blueprint 1.34 release
- Update to Theia 1.34.4
- Update C/C++ extensions to latest versions
  • Loading branch information
sdirix authored Mar 31, 2023
2 parents 25be21a + a925389 commit 6430de4
Show file tree
Hide file tree
Showing 19 changed files with 3,221 additions and 3,145 deletions.
4 changes: 3 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@
.vscode/
.devcontainer/

next/
next/

applications/browser/
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,26 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-2019, ubuntu-18.04, macos-10.15]
os: [windows-2019, ubuntu-latest, macos-11]
node: ['14.x']

runs-on: ${{ matrix.os }}
timeout-minutes: 60

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0 # To fetch all history for all branches and tags. (Will be required for caching with lerna: https://github.com/markuplint/markuplint/pull/111)

- name: Use Node.js ${{ matrix.node }}
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
registry-url: 'https://registry.npmjs.org'

- name: Use Python 3.x
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '3.10.8'

Expand Down
6 changes: 6 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@
"name": "Attach by Process ID",
"processId": "${command:PickProcess}"
},
{
"type": "node",
"request": "launch",
"name": "Launch with Node.js",
"program": "${file}"
},
{
"type": "node",
"request": "launch",
Expand Down
106 changes: 54 additions & 52 deletions applications/browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,54 +31,54 @@
}
},
"dependencies": {
"@theia/bulk-edit": "1.31.1",
"@theia/callhierarchy": "1.31.1",
"@theia/console": "1.31.1",
"@theia/core": "1.31.1",
"@theia/debug": "1.31.1",
"@theia/editor": "1.31.1",
"@theia/editor-preview": "1.31.1",
"@theia/external-terminal": "1.31.1",
"@theia/file-search": "1.31.1",
"@theia/filesystem": "1.31.1",
"@theia/getting-started": "1.31.1",
"@theia/keymaps": "1.31.1",
"@theia/markers": "1.31.1",
"@theia/messages": "1.31.1",
"@theia/memory-inspector": "1.31.1",
"@theia/metrics": "1.31.1",
"@theia/mini-browser": "1.31.1",
"@theia/monaco": "1.31.1",
"@theia/navigator": "1.31.1",
"@theia/outline-view": "1.31.1",
"@theia/output": "1.31.1",
"@theia/plugin-dev": "1.31.1",
"@theia/plugin-ext": "1.31.1",
"@theia/plugin-ext-vscode": "1.31.1",
"@theia/preferences": "1.31.1",
"@theia/preview": "1.31.1",
"@theia/process": "1.31.1",
"@theia/property-view": "1.31.1",
"@theia/scm": "1.31.1",
"@theia/scm-extra": "1.31.1",
"@theia/search-in-workspace": "1.31.1",
"@theia/task": "1.31.1",
"@theia/terminal": "1.31.1",
"@theia/timeline": "1.31.1",
"@theia/toolbar": "1.31.1",
"@theia/typehierarchy": "1.31.1",
"@theia/userstorage": "1.31.1",
"@theia/variable-resolver": "1.31.1",
"@theia/vsx-registry": "1.31.1",
"@theia/workspace": "1.31.1",
"@theia/bulk-edit": "1.34.4",
"@theia/callhierarchy": "1.34.4",
"@theia/console": "1.34.4",
"@theia/core": "1.34.4",
"@theia/debug": "1.34.4",
"@theia/editor": "1.34.4",
"@theia/editor-preview": "1.34.4",
"@theia/external-terminal": "1.34.4",
"@theia/file-search": "1.34.4",
"@theia/filesystem": "1.34.4",
"@theia/getting-started": "1.34.4",
"@theia/keymaps": "1.34.4",
"@theia/markers": "1.34.4",
"@theia/messages": "1.34.4",
"@theia/memory-inspector": "1.34.4",
"@theia/metrics": "1.34.4",
"@theia/mini-browser": "1.34.4",
"@theia/monaco": "1.34.4",
"@theia/navigator": "1.34.4",
"@theia/outline-view": "1.34.4",
"@theia/output": "1.34.4",
"@theia/plugin-dev": "1.34.4",
"@theia/plugin-ext": "1.34.4",
"@theia/plugin-ext-vscode": "1.34.4",
"@theia/preferences": "1.34.4",
"@theia/preview": "1.34.4",
"@theia/process": "1.34.4",
"@theia/property-view": "1.34.4",
"@theia/scm": "1.34.4",
"@theia/scm-extra": "1.34.4",
"@theia/search-in-workspace": "1.34.4",
"@theia/task": "1.34.4",
"@theia/terminal": "1.34.4",
"@theia/timeline": "1.34.4",
"@theia/toolbar": "1.34.4",
"@theia/typehierarchy": "1.34.4",
"@theia/userstorage": "1.34.4",
"@theia/variable-resolver": "1.34.4",
"@theia/vsx-registry": "1.34.4",
"@theia/workspace": "1.34.4",
"fs-extra": "^9.0.1",
"cdt-cloud-blueprint-updater": "1.31.1",
"cdt-cloud-blueprint-product": "1.31.1",
"theia-traceviewer": "0.2.0-next.38d4e17.0",
"@eclipse-cdt-cloud/blueprint-example-generator": "1.31.1"
"cdt-cloud-blueprint-updater": "1.34.4",
"cdt-cloud-blueprint-product": "1.34.4",
"theia-traceviewer": "0.2.0-next.75c9da4.0",
"@eclipse-cdt-cloud/blueprint-example-generator": "1.34.4"
},
"devDependencies": {
"@theia/cli": "1.31.1"
"@theia/cli": "1.34.4"
},
"scripts": {
"prepare": "yarn build && yarn download:plugins",
Expand All @@ -97,13 +97,12 @@
},
"theiaPluginsDir": "plugins",
"theiaPlugins": {
"vscode.git": "https://open-vsx.org/api/vscode/git/1.52.1/file/vscode.git-1.52.1.vsix",
"vscode.markdown-language-features": "https://open-vsx.org/api/vscode/markdown-language-features/1.39.2/file/vscode.markdown-language-features-1.39.2.vsix",
"vscode-builtin-extensions-pack": "https://open-vsx.org/api/eclipse-theia/builtin-extension-pack/1.50.1/file/eclipse-theia.builtin-extension-pack-1.50.1.vsix",
"cdt-gdb-vscode": "https://open-vsx.org/api/eclipse-cdt/cdt-gdb-vscode/0.0.93/file/eclipse-cdt.cdt-gdb-vscode-0.0.93.vsix",
"vscode.markdown-language-features": "https://open-vsx.org/api/vscode/markdown-language-features/1.64.2/file/vscode.markdown-language-features-1.64.2.vsix",
"eclipse-theia.builtin-extension-pack": "https://open-vsx.org/api/eclipse-theia/builtin-extension-pack/1.70.2/file/eclipse-theia.builtin-extension-pack-1.70.2.vsix",
"cdt-gdb-vscode": "https://open-vsx.org/api/eclipse-cdt/cdt-gdb-vscode/0.0.95/file/eclipse-cdt.cdt-gdb-vscode-0.0.95.vsix",
"vscode-builtin-cpp": "https://open-vsx.org/api/vscode/cpp/1.62.3/file/vscode.cpp-1.62.3.vsix",
"vscode-clangd": "https://open-vsx.org/api/llvm-vs-code-extensions/vscode-clangd/0.1.15/file/llvm-vs-code-extensions.vscode-clangd-0.1.15.vsix",
"vscode-cmake": "https://open-vsx.org/api/ms-vscode/cmake-tools/1.10.5/file/ms-vscode.cmake-tools-1.10.5.vsix",
"vscode-clangd": "https://open-vsx.org/api/llvm-vs-code-extensions/vscode-clangd/0.1.23/file/llvm-vs-code-extensions.vscode-clangd-0.1.23.vsix",
"vscode-cmake": "https://open-vsx.org/api/ms-vscode/cmake-tools/1.13.45/file/ms-vscode.cmake-tools-1.13.45.vsix",
"cdtcloud-clangd-contexts": "https://github.com/eclipse-cdt-cloud/clangd-contexts/releases/download/v0.8.0/cdtcloud-clangd-contexts-ext-0.8.0.vsix"
},
"theiaPluginsExcludeIds": [
Expand All @@ -113,6 +112,9 @@
"vscode.git-ui",
"vscode.github",
"vscode.github-authentication",
"vscode.microsoft-authentication"
"vscode.microsoft-authentication",
"ms-vscode.js-debug",
"vscode.ipynb",
"vscode.references-view"
]
}
109 changes: 58 additions & 51 deletions applications/docker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,60 +23,65 @@
"frontend": {
"config": {
"applicationName": "CDT Cloud Blueprint",
"defaultIconTheme": "theia-file-icons",
"preferences": {
"toolbar.showToolbar": true,
"files.enableTrash": false
"files.enableTrash": false,
"security.workspace.trust.startupPrompt": "never",
"security.workspace.trust.enabled": false
}
}
}
},
"dependencies": {
"@theia/bulk-edit": "1.31.1",
"@theia/callhierarchy": "1.31.1",
"@theia/console": "1.31.1",
"@theia/core": "1.31.1",
"@theia/debug": "1.31.1",
"@theia/editor": "1.31.1",
"@theia/editor-preview": "1.31.1",
"@theia/external-terminal": "1.31.1",
"@theia/file-search": "1.31.1",
"@theia/filesystem": "1.31.1",
"@theia/getting-started": "1.31.1",
"@theia/keymaps": "1.31.1",
"@theia/markers": "1.31.1",
"@theia/messages": "1.31.1",
"@theia/memory-inspector": "1.31.1",
"@theia/metrics": "1.31.1",
"@theia/mini-browser": "1.31.1",
"@theia/monaco": "1.31.1",
"@theia/navigator": "1.31.1",
"@theia/outline-view": "1.31.1",
"@theia/output": "1.31.1",
"@theia/plugin-dev": "1.31.1",
"@theia/plugin-ext": "1.31.1",
"@theia/plugin-ext-vscode": "1.31.1",
"@theia/preferences": "1.31.1",
"@theia/preview": "1.31.1",
"@theia/process": "1.31.1",
"@theia/property-view": "1.31.1",
"@theia/scm": "1.31.1",
"@theia/scm-extra": "1.31.1",
"@theia/search-in-workspace": "1.31.1",
"@theia/task": "1.31.1",
"@theia/terminal": "1.31.1",
"@theia/timeline": "1.31.1",
"@theia/toolbar": "1.31.1",
"@theia/typehierarchy": "1.31.1",
"@theia/userstorage": "1.31.1",
"@theia/variable-resolver": "1.31.1",
"@theia/vsx-registry": "1.31.1",
"@theia/workspace": "1.31.1",
"@theia/bulk-edit": "1.34.4",
"@theia/callhierarchy": "1.34.4",
"@theia/console": "1.34.4",
"@theia/core": "1.34.4",
"@theia/debug": "1.34.4",
"@theia/editor": "1.34.4",
"@theia/editor-preview": "1.34.4",
"@theia/external-terminal": "1.34.4",
"@theia/file-search": "1.34.4",
"@theia/filesystem": "1.34.4",
"@theia/getting-started": "1.34.4",
"@theia/keymaps": "1.34.4",
"@theia/markers": "1.34.4",
"@theia/messages": "1.34.4",
"@theia/memory-inspector": "1.34.4",
"@theia/metrics": "1.34.4",
"@theia/mini-browser": "1.34.4",
"@theia/monaco": "1.34.4",
"@theia/navigator": "1.34.4",
"@theia/outline-view": "1.34.4",
"@theia/output": "1.34.4",
"@theia/plugin-dev": "1.34.4",
"@theia/plugin-ext": "1.34.4",
"@theia/plugin-ext-vscode": "1.34.4",
"@theia/preferences": "1.34.4",
"@theia/preview": "1.34.4",
"@theia/process": "1.34.4",
"@theia/property-view": "1.34.4",
"@theia/scm": "1.34.4",
"@theia/scm-extra": "1.34.4",
"@theia/search-in-workspace": "1.34.4",
"@theia/task": "1.34.4",
"@theia/terminal": "1.34.4",
"@theia/timeline": "1.34.4",
"@theia/toolbar": "1.34.4",
"@theia/typehierarchy": "1.34.4",
"@theia/userstorage": "1.34.4",
"@theia/variable-resolver": "1.34.4",
"@theia/vsx-registry": "1.34.4",
"@theia/workspace": "1.34.4",
"fs-extra": "^9.0.1",
"cdt-cloud-blueprint-product": "1.31.1",
"theia-traceviewer": "0.2.0-next.38d4e17.0"
"cdt-cloud-blueprint-product": "1.34.4",
"cdt-cloud-blueprint-launcher": "1.34.4",
"theia-traceviewer": "0.2.0-next.75c9da4.0",
"@eclipse-cdt-cloud/blueprint-example-generator": "1.34.4"
},
"devDependencies": {
"@theia/cli": "1.31.1"
"@theia/cli": "1.34.4"
},
"scripts": {
"prepare": "yarn build && yarn download:plugins",
Expand All @@ -95,13 +100,12 @@
},
"theiaPluginsDir": "plugins",
"theiaPlugins": {
"vscode.git": "https://open-vsx.org/api/vscode/git/1.52.1/file/vscode.git-1.52.1.vsix",
"vscode.markdown-language-features": "https://open-vsx.org/api/vscode/markdown-language-features/1.39.2/file/vscode.markdown-language-features-1.39.2.vsix",
"vscode-builtin-extensions-pack": "https://open-vsx.org/api/eclipse-theia/builtin-extension-pack/1.50.1/file/eclipse-theia.builtin-extension-pack-1.50.1.vsix",
"cdt-gdb-vscode": "https://open-vsx.org/api/eclipse-cdt/cdt-gdb-vscode/0.0.93/file/eclipse-cdt.cdt-gdb-vscode-0.0.93.vsix",
"vscode.markdown-language-features": "https://open-vsx.org/api/vscode/markdown-language-features/1.64.2/file/vscode.markdown-language-features-1.64.2.vsix",
"eclipse-theia.builtin-extension-pack": "https://open-vsx.org/api/eclipse-theia/builtin-extension-pack/1.70.2/file/eclipse-theia.builtin-extension-pack-1.70.2.vsix",
"cdt-gdb-vscode": "https://open-vsx.org/api/eclipse-cdt/cdt-gdb-vscode/0.0.95/file/eclipse-cdt.cdt-gdb-vscode-0.0.95.vsix",
"vscode-builtin-cpp": "https://open-vsx.org/api/vscode/cpp/1.62.3/file/vscode.cpp-1.62.3.vsix",
"vscode-clangd": "https://open-vsx.org/api/llvm-vs-code-extensions/vscode-clangd/0.1.15/file/llvm-vs-code-extensions.vscode-clangd-0.1.15.vsix",
"vscode-cmake": "https://open-vsx.org/api/ms-vscode/cmake-tools/1.10.5/file/ms-vscode.cmake-tools-1.10.5.vsix",
"vscode-clangd": "https://open-vsx.org/api/llvm-vs-code-extensions/vscode-clangd/0.1.23/file/llvm-vs-code-extensions.vscode-clangd-0.1.23.vsix",
"vscode-cmake": "https://open-vsx.org/api/ms-vscode/cmake-tools/1.13.45/file/ms-vscode.cmake-tools-1.13.45.vsix",
"cdtcloud-clangd-contexts": "https://github.com/eclipse-cdt-cloud/clangd-contexts/releases/download/v0.8.0/cdtcloud-clangd-contexts-ext-0.8.0.vsix"
},
"theiaPluginsExcludeIds": [
Expand All @@ -111,6 +115,9 @@
"vscode.git-ui",
"vscode.github",
"vscode.github-authentication",
"vscode.microsoft-authentication"
"vscode.microsoft-authentication",
"ms-vscode.js-debug",
"vscode.ipynb",
"vscode.references-view"
]
}
Loading

0 comments on commit 6430de4

Please sign in to comment.