Skip to content

Commit

Permalink
Update CDT Cloud Blueprint to 1.52.0
Browse files Browse the repository at this point in the history
- Merge Theia Blueprint/IDE 1.45 release
- Adapt code base where necessary
- Update dependencies
- Update vs code extensions

Contributed on behalf of STMicroelectronics
  • Loading branch information
jfaltermeier committed Nov 8, 2024
2 parents ed5a143 + eee0a28 commit 8513f42
Show file tree
Hide file tree
Showing 15 changed files with 1,170 additions and 1,179 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-2019, ubuntu-latest, macos-12]
os: [windows-2019, ubuntu-latest, macos-14]
node: ['20.x']

runs-on: ${{ matrix.os }}
Expand All @@ -37,7 +37,7 @@ jobs:
node-version: ${{ matrix.node }}
registry-url: 'https://registry.npmjs.org'

- name: Use Python 3.x
- name: Use Python 3.11
uses: actions/setup-python@v4
with:
python-version: '3.11'
Expand Down
9 changes: 5 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ pipeline {
// We will still stop short of publishing anything.
BLUEPRINT_JENKINS_RELEASE_DRYRUN = 'false'
// BLUEPRINT_JENKINS_RELEASE_DRYRUN = 'true'

msvs_version = '2019'
GYP_MSVS_VERSION = '2019'
NODE_OPTIONS = '--max_old_space_size=4096'
}
stages {
Expand Down Expand Up @@ -263,7 +264,7 @@ spec:
container('jnlp') {
script {
uploadInstaller('windows')
copyInstallerAndUpdateLatestYml('windows', 'CDTCloudBlueprintSetup', 'exe', 'latest.yml', '1.40.1,1.43.1,1.45.1')
copyInstallerAndUpdateLatestYml('windows', 'CDTCloudBlueprintSetup', 'exe', 'latest.yml', '1.40.1,1.43.1,1.45.1,1.49.101')
}
}
}
Expand All @@ -274,11 +275,11 @@ spec:
}

def buildInstaller(int sleepBetweenRetries) {
int maxRetry = 3
int maxRetry = 1
String buildPackageCmd

checkout scm

// only build the Electron app for now
buildPackageCmd = 'yarn --frozen-lockfile --force && \
yarn build:extensions && yarn electron build'
Expand Down
94 changes: 47 additions & 47 deletions applications/browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "cdt-cloud-blueprint-browser-app",
"description": "CDT Cloud Blueprint is a template for building custom web-based C/C++ tools",
"productName": "CDT Cloud Blueprint",
"version": "1.49.101",
"version": "1.52.0",
"license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0",
"author": {
"name": "CDT Cloud",
Expand Down Expand Up @@ -49,55 +49,55 @@
}
},
"dependencies": {
"@theia/bulk-edit": "1.49.1",
"@theia/callhierarchy": "1.49.1",
"@theia/console": "1.49.1",
"@theia/core": "1.49.1",
"@theia/debug": "1.49.1",
"@theia/dev-container": "1.49.1",
"@theia/editor": "1.49.1",
"@theia/editor-preview": "1.49.1",
"@theia/external-terminal": "1.49.1",
"@theia/file-search": "1.49.1",
"@theia/filesystem": "1.49.1",
"@theia/getting-started": "1.49.1",
"@theia/keymaps": "1.49.1",
"@theia/markers": "1.49.1",
"@theia/memory-inspector": "1.49.1",
"@theia/messages": "1.49.1",
"@theia/metrics": "1.49.1",
"@theia/mini-browser": "1.49.1",
"@theia/monaco": "1.49.1",
"@theia/navigator": "1.49.1",
"@theia/outline-view": "1.49.1",
"@theia/output": "1.49.1",
"@theia/plugin-dev": "1.49.1",
"@theia/plugin-ext": "1.49.1",
"@theia/plugin-ext-vscode": "1.49.1",
"@theia/preferences": "1.49.1",
"@theia/process": "1.49.1",
"@theia/property-view": "1.49.1",
"@theia/remote": "1.49.1",
"@theia/scm": "1.49.1",
"@theia/search-in-workspace": "1.49.1",
"@theia/secondary-window": "1.49.1",
"@theia/task": "1.49.1",
"@theia/terminal": "1.49.1",
"@theia/timeline": "1.49.1",
"@theia/toolbar": "1.49.1",
"@theia/typehierarchy": "1.49.1",
"@theia/userstorage": "1.49.1",
"@theia/variable-resolver": "1.49.1",
"@theia/vsx-registry": "1.49.1",
"@theia/workspace": "1.49.1",
"@theia/bulk-edit": "1.52.0",
"@theia/callhierarchy": "1.52.0",
"@theia/console": "1.52.0",
"@theia/core": "1.52.0",
"@theia/debug": "1.52.0",
"@theia/dev-container": "1.52.0",
"@theia/editor": "1.52.0",
"@theia/editor-preview": "1.52.0",
"@theia/external-terminal": "1.52.0",
"@theia/file-search": "1.52.0",
"@theia/filesystem": "1.52.0",
"@theia/getting-started": "1.52.0",
"@theia/keymaps": "1.52.0",
"@theia/markers": "1.52.0",
"@theia/memory-inspector": "1.52.0",
"@theia/messages": "1.52.0",
"@theia/metrics": "1.52.0",
"@theia/mini-browser": "1.52.0",
"@theia/monaco": "1.52.0",
"@theia/navigator": "1.52.0",
"@theia/outline-view": "1.52.0",
"@theia/output": "1.52.0",
"@theia/plugin-dev": "1.52.0",
"@theia/plugin-ext": "1.52.0",
"@theia/plugin-ext-vscode": "1.52.0",
"@theia/preferences": "1.52.0",
"@theia/process": "1.52.0",
"@theia/property-view": "1.52.0",
"@theia/remote": "1.52.0",
"@theia/scm": "1.52.0",
"@theia/search-in-workspace": "1.52.0",
"@theia/secondary-window": "1.52.0",
"@theia/task": "1.52.0",
"@theia/terminal": "1.52.0",
"@theia/timeline": "1.52.0",
"@theia/toolbar": "1.52.0",
"@theia/typehierarchy": "1.52.0",
"@theia/userstorage": "1.52.0",
"@theia/variable-resolver": "1.52.0",
"@theia/vsx-registry": "1.52.0",
"@theia/workspace": "1.52.0",
"fs-extra": "^9.0.1",
"cdt-cloud-blueprint-updater-ext": "1.49.101",
"cdt-cloud-blueprint-product-ext": "1.49.101",
"theia-traceviewer": "0.2.4",
"@eclipse-cdt-cloud/blueprint-examples": "1.49.101"
"cdt-cloud-blueprint-updater-ext": "1.52.0",
"cdt-cloud-blueprint-product-ext": "1.52.0",
"theia-traceviewer": "0.3.0",
"@eclipse-cdt-cloud/blueprint-examples": "1.52.0"
},
"devDependencies": {
"@theia/cli": "1.49.1"
"@theia/cli": "1.52.0"
},
"scripts": {
"clean": "theia clean && rimraf node_modules",
Expand Down
92 changes: 46 additions & 46 deletions applications/docker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "cdt-cloud-blueprint-docker-app",
"description": "CDT Cloud Blueprint is a template for building custom web-based C/C++ tools",
"productName": "CDT Cloud Blueprint",
"version": "1.49.101",
"version": "1.52.0",
"license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0",
"author": {
"name": "CDT Cloud",
Expand Down Expand Up @@ -36,54 +36,54 @@
}
},
"dependencies": {
"@theia/bulk-edit": "1.49.1",
"@theia/callhierarchy": "1.49.1",
"@theia/console": "1.49.1",
"@theia/core": "1.49.1",
"@theia/debug": "1.49.1",
"@theia/dev-container": "1.49.1",
"@theia/editor": "1.49.1",
"@theia/editor-preview": "1.49.1",
"@theia/external-terminal": "1.49.1",
"@theia/file-search": "1.49.1",
"@theia/filesystem": "1.49.1",
"@theia/getting-started": "1.49.1",
"@theia/keymaps": "1.49.1",
"@theia/markers": "1.49.1",
"@theia/memory-inspector": "1.49.1",
"@theia/messages": "1.49.1",
"@theia/metrics": "1.49.1",
"@theia/mini-browser": "1.49.1",
"@theia/monaco": "1.49.1",
"@theia/navigator": "1.49.1",
"@theia/outline-view": "1.49.1",
"@theia/output": "1.49.1",
"@theia/plugin-dev": "1.49.1",
"@theia/plugin-ext": "1.49.1",
"@theia/plugin-ext-vscode": "1.49.1",
"@theia/preferences": "1.49.1",
"@theia/process": "1.49.1",
"@theia/property-view": "1.49.1",
"@theia/scm": "1.49.1",
"@theia/search-in-workspace": "1.49.1",
"@theia/secondary-window": "1.49.1",
"@theia/task": "1.49.1",
"@theia/terminal": "1.49.1",
"@theia/timeline": "1.49.1",
"@theia/toolbar": "1.49.1",
"@theia/typehierarchy": "1.49.1",
"@theia/userstorage": "1.49.1",
"@theia/variable-resolver": "1.49.1",
"@theia/vsx-registry": "1.49.1",
"@theia/workspace": "1.49.1",
"@theia/bulk-edit": "1.52.0",
"@theia/callhierarchy": "1.52.0",
"@theia/console": "1.52.0",
"@theia/core": "1.52.0",
"@theia/debug": "1.52.0",
"@theia/dev-container": "1.52.0",
"@theia/editor": "1.52.0",
"@theia/editor-preview": "1.52.0",
"@theia/external-terminal": "1.52.0",
"@theia/file-search": "1.52.0",
"@theia/filesystem": "1.52.0",
"@theia/getting-started": "1.52.0",
"@theia/keymaps": "1.52.0",
"@theia/markers": "1.52.0",
"@theia/memory-inspector": "1.52.0",
"@theia/messages": "1.52.0",
"@theia/metrics": "1.52.0",
"@theia/mini-browser": "1.52.0",
"@theia/monaco": "1.52.0",
"@theia/navigator": "1.52.0",
"@theia/outline-view": "1.52.0",
"@theia/output": "1.52.0",
"@theia/plugin-dev": "1.52.0",
"@theia/plugin-ext": "1.52.0",
"@theia/plugin-ext-vscode": "1.52.0",
"@theia/preferences": "1.52.0",
"@theia/process": "1.52.0",
"@theia/property-view": "1.52.0",
"@theia/scm": "1.52.0",
"@theia/search-in-workspace": "1.52.0",
"@theia/secondary-window": "1.52.0",
"@theia/task": "1.52.0",
"@theia/terminal": "1.52.0",
"@theia/timeline": "1.52.0",
"@theia/toolbar": "1.52.0",
"@theia/typehierarchy": "1.52.0",
"@theia/userstorage": "1.52.0",
"@theia/variable-resolver": "1.52.0",
"@theia/vsx-registry": "1.52.0",
"@theia/workspace": "1.52.0",
"fs-extra": "^9.0.1",
"cdt-cloud-blueprint-updater-ext": "1.49.101",
"cdt-cloud-blueprint-product-ext": "1.49.101",
"theia-traceviewer": "0.2.4",
"@eclipse-cdt-cloud/blueprint-examples": "1.49.101"
"cdt-cloud-blueprint-updater-ext": "1.52.0",
"cdt-cloud-blueprint-product-ext": "1.52.0",
"theia-traceviewer": "0.3.0",
"@eclipse-cdt-cloud/blueprint-examples": "1.52.0"
},
"devDependencies": {
"@theia/cli": "1.49.1"
"@theia/cli": "1.52.0"
},
"scripts": {
"clean": "theia clean && rimraf node_modules",
Expand Down
2 changes: 1 addition & 1 deletion applications/electron/electron-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ appId: eclipse.theia
productName: CDTCloudBlueprint
copyright: Copyright © 2020-2023 Eclipse Foundation, Inc
electronDist: ../../node_modules/electron/dist
electronVersion: 23.3.13
electronVersion: 28.3.3
# Although it is generally not recommended to disable asar, it is required for Theia.
# Enabling this leads to: process ERROR Error: spawn ENOTDIR
# because binaries can not be executed from the asar archive.
Expand Down
Loading

0 comments on commit 8513f42

Please sign in to comment.