Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@iyannsch
iyannsch committed Nov 11, 2024
2 parents ffacce9 + 081aae0 commit 87384da
Show file tree
Hide file tree
Showing 18 changed files with 1,125 additions and 666 deletions.
31 changes: 30 additions & 1 deletion Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,11 @@ spec:
}
container('jnlp') {
script {
echo 'Computing updatable versions before uploading new installer'
def updatableVersions = getUpdatableVersions()
echo 'updatableVersions: ' + updatableVersions
uploadInstaller('windows')
copyInstallerAndUpdateLatestYml('windows', 'TheiaIDESetup', 'exe', 'latest.yml', '1.46.0,1.46.100,1.47.0,1.47.100,1.48.0,1.48.300,1.49.100,1.49.101,1.50.0,1.50.100,1.51.0,1.52.0,1.53.100,1.53.200')
copyInstallerAndUpdateLatestYml('windows', 'TheiaIDESetup', 'exe', 'latest.yml', updatableVersions)
}
}
}
Expand Down Expand Up @@ -413,6 +416,32 @@ def uploadInstaller(String platform) {
}
}

/**
* List all directories in the ide-preview directory.
* Only takes the ones with a version identifier name.
* Only take version numbers lower than the current version.
*/
def getUpdatableVersions() {
def packageJSON = readJSON file: "package.json"
String currentVersion = "${packageJSON.version}"

def versions = ''

sshagent(['projects-storage.eclipse.org-bot-ssh']) {
versions = sh(
script: """
ssh [email protected] "cd /home/data/httpd/download.eclipse.org/theia/ide-preview/ && \
find . -maxdepth 1 -type d -regex '.*/[0-9]+\\.[0-9]+\\.[0-9]+' -exec basename {} \\; | sort -V | awk -v curVer='${currentVersion}' '{
if (\\\$1 != curVer && \\\$1 < curVer) print \\\$1
}' | paste -sd ','"
""",
returnStdout: true
).trim()
}

return versions
}

/**
* Currently we have the windows updater available twice with different names.
* We want to have a name without the versions for providing a stable download link.
Expand Down
11 changes: 1 addition & 10 deletions PUBLISHING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,6 @@ If there was a Theia Release

and adapt the code/built-ins accordingly.

Next, update the `Jenkinsfile`'s `copyInstallerAndUpdateLatestYml` invocation for windows. Here we have to specficy for which olders versions we want to enable direct (incremental) updates to this version on Windows.\
See <https://download.eclipse.org/theia/ide-preview/> for the available old versions.\
*We plan to automate this, but at the moment it's a manual step.*

E.g.:\
`copyInstallerAndUpdateLatestYml('windows', 'TheiaIDESetup', 'exe', 'latest.yml', '1.46.0,1.46.100,1.47.0')`\
->\
`copyInstallerAndUpdateLatestYml('windows', 'TheiaIDESetup', 'exe', 'latest.yml', '1.46.0,1.46.100,1.47.0,1.47.100')`

Finally, open a PR with your changes.

## Upgrade Dependencies
Expand All @@ -66,7 +57,7 @@ E.g. `1.45.0,1.46.100,1.47.100`.\

## Publish Docker Image

Run this [workflow](https://github.com/eclipse-theia/theia-blueprint/actions/workflows/publish-theia-ide-img.yml) from the master branch.
Run this [workflow](https://github.com/eclipse-theia/theia-ide/actions/workflows/publish-theia-ide-img.yml) from the master branch.

## Preview, Testing and Release Process for the Theia IDE

Expand Down
15 changes: 7 additions & 8 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<br/>
<div id="theia-logo" align="center">
<br />
<img src="https://raw.githubusercontent.com/eclipse-theia/theia-blueprint/master/theia-extensions/product/src/browser/icons/TheiaIDE.png" alt="Theia Logo" width="300"/>
<img src="https://raw.githubusercontent.com/eclipse-theia/theia-ide/master/theia-extensions/product/src/browser/icons/TheiaIDE.png" alt="Theia Logo" width="300"/>
<h3>Eclipse Theia IDE</h3>
</div>

<div id="badges" align="center">

The Eclipse Theia IDE is built with this project.\
Eclipse Theia IDE/Blueprint also serves as a template for building desktop-based products based on the Eclipse Theia platform.
Eclipse Theia IDE also serves as a template for building desktop-based products based on the Eclipse Theia platform.

</div>

Expand All @@ -23,8 +23,7 @@ Eclipse Theia IDE/Blueprint also serves as a template for building desktop-based

## License

- [Eclipse Public License 2.0](LICENSE)
- [一 (Secondary) GNU General Public License, version 2 with the GNU Classpath Exception](LICENSE)
- [MIT](LICENSE)

## Trademark

Expand All @@ -40,7 +39,7 @@ The Eclipse Theia IDE also serves as a **template** for building desktop-based p

## Theia IDE vs Theia Blueprint

The Theia IDE has been rebranded from its original name “Theia Blueprint”. To avoid any confusion, the repository and code artifacts will keep the name “Blueprint”. You can therefore assume the terms “Theia IDE” and “Theia Blueprint” to be synonymous.
The Theia IDE has been rebranded from its original name “Theia Blueprint”. You can therefore assume the terms “Theia IDE” and “Theia Blueprint” to be synonymous.

## Development

Expand Down Expand Up @@ -127,12 +126,12 @@ and connect to <http://localhost:3000/>
### Reporting Feature Requests and Bugs

The features in the Eclipse Theia IDE are based on Theia and the included extensions/plugins. For bugs in Theia please consider opening an issue in the [Theia project on Github](https://github.com/eclipse-theia/theia/issues/new/choose).
The Eclipse Theia IDE only packages existing functionality into a product and installers for the product. If you believe there is a mistake in packaging, something needs to be added to the packaging or the installers do not work properly, please [open an issue on Github](https://github.com/eclipse-theia/theia-blueprint/issues/new/choose) to let us know.
The Eclipse Theia IDE only packages existing functionality into a product and installers for the product. If you believe there is a mistake in packaging, something needs to be added to the packaging or the installers do not work properly, please [open an issue on Github](https://github.com/eclipse-theia/theia-ide/issues/new/choose) to let us know.

### Docker

The Docker image of the Theia IDE is currently in *experimental state*. It is built from the same sources and packages as the desktop version, but it is not part of the [preview test](https://github.com/eclipse-theia/theia-blueprint/blob/master/PUBLISHING.md#preview-testing-and-release-process-for-the-theia-ide).
You can find a prebuilt Docker image of the IDE [here](https://github.com/eclipse-theia/theia-blueprint/pkgs/container/theia-blueprint%2Ftheia-ide).
The Docker image of the Theia IDE is currently in *experimental state*. It is built from the same sources and packages as the desktop version, but it is not part of the [preview test](https://github.com/eclipse-theia/theia-ide/blob/master/PUBLISHING.md#preview-testing-and-release-process-for-the-theia-ide).
You can find a prebuilt Docker image of the IDE [here](https://github.com/eclipse-theia/theia-ide/pkgs/container/theia-ide%2Ftheia-ide).

You can also create the Docker image for the Eclipse Theia IDE based on the browser app with the following build command:

Expand Down
96 changes: 49 additions & 47 deletions applications/browser/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
"name": "theia-ide-browser-app",
"description": "Eclipse Theia IDE browser product",
"productName": "Theia IDE",
"version": "1.54.0",
"version": "1.55.0",
"license": "MIT",
"author": "Eclipse Theia <[email protected]>",
"homepage": "https://github.com/eclipse-theia/theia-blueprint#readme",
"homepage": "https://github.com/eclipse-theia/theia-ide#readme",
"bugs": {
"url": "https://github.com/eclipse-theia/theia/issues"
},
"repository": {
"type": "git",
"url": "git+https://github.com/eclipse-theia/theia-blueprint.git"
"url": "git+https://github.com/eclipse-theia/theia-ide.git"
},
"engines": {
"yarn": ">=1.7.0 <2",
Expand All @@ -34,7 +34,8 @@
"config": {
"warnOnPotentiallyInsecureHostPattern": false,
"startupTimeout": -1,
"resolveSystemPlugins": false
"resolveSystemPlugins": false,
"configurationFolder": ".theia-ide"
}
},
"generator": {
Expand All @@ -44,53 +45,54 @@
}
},
"dependencies": {
"@theia/bulk-edit": "1.54.0",
"@theia/callhierarchy": "1.54.0",
"@theia/console": "1.54.0",
"@theia/core": "1.54.0",
"@theia/debug": "1.54.0",
"@theia/dev-container": "1.54.0",
"@theia/editor": "1.54.0",
"@theia/editor-preview": "1.54.0",
"@theia/external-terminal": "1.54.0",
"@theia/file-search": "1.54.0",
"@theia/filesystem": "1.54.0",
"@theia/getting-started": "1.54.0",
"@theia/keymaps": "1.54.0",
"@theia/markers": "1.54.0",
"@theia/memory-inspector": "1.54.0",
"@theia/messages": "1.54.0",
"@theia/metrics": "1.54.0",
"@theia/mini-browser": "1.54.0",
"@theia/monaco": "1.54.0",
"@theia/navigator": "1.54.0",
"@theia/outline-view": "1.54.0",
"@theia/output": "1.54.0",
"@theia/plugin-dev": "1.54.0",
"@theia/plugin-ext": "1.54.0",
"@theia/plugin-ext-vscode": "1.54.0",
"@theia/preferences": "1.54.0",
"@theia/process": "1.54.0",
"@theia/property-view": "1.54.0",
"@theia/remote": "1.54.0",
"@theia/scm": "1.54.0",
"@theia/search-in-workspace": "1.54.0",
"@theia/secondary-window": "1.54.0",
"@theia/task": "1.54.0",
"@theia/terminal": "1.54.0",
"@theia/timeline": "1.54.0",
"@theia/toolbar": "1.54.0",
"@theia/typehierarchy": "1.54.0",
"@theia/userstorage": "1.54.0",
"@theia/variable-resolver": "1.54.0",
"@theia/vsx-registry": "1.54.0",
"@theia/workspace": "1.54.0",
"@theia/bulk-edit": "1.55.0",
"@theia/callhierarchy": "1.55.0",
"@theia/collaboration": "1.55.0",
"@theia/console": "1.55.0",
"@theia/core": "1.55.0",
"@theia/debug": "1.55.0",
"@theia/dev-container": "1.55.0",
"@theia/editor": "1.55.0",
"@theia/editor-preview": "1.55.0",
"@theia/external-terminal": "1.55.0",
"@theia/file-search": "1.55.0",
"@theia/filesystem": "1.55.0",
"@theia/getting-started": "1.55.0",
"@theia/keymaps": "1.55.0",
"@theia/markers": "1.55.0",
"@theia/memory-inspector": "1.55.0",
"@theia/messages": "1.55.0",
"@theia/metrics": "1.55.0",
"@theia/mini-browser": "1.55.0",
"@theia/monaco": "1.55.0",
"@theia/navigator": "1.55.0",
"@theia/outline-view": "1.55.0",
"@theia/output": "1.55.0",
"@theia/plugin-dev": "1.55.0",
"@theia/plugin-ext": "1.55.0",
"@theia/plugin-ext-vscode": "1.55.0",
"@theia/preferences": "1.55.0",
"@theia/process": "1.55.0",
"@theia/property-view": "1.55.0",
"@theia/remote": "1.55.0",
"@theia/scm": "1.55.0",
"@theia/search-in-workspace": "1.55.0",
"@theia/secondary-window": "1.55.0",
"@theia/task": "1.55.0",
"@theia/terminal": "1.55.0",
"@theia/timeline": "1.55.0",
"@theia/toolbar": "1.55.0",
"@theia/typehierarchy": "1.55.0",
"@theia/userstorage": "1.55.0",
"@theia/variable-resolver": "1.55.0",
"@theia/vsx-registry": "1.55.0",
"@theia/workspace": "1.55.0",
"fs-extra": "^9.0.1",
"theia-ide-product-ext": "1.54.0",
"theia-ide-product-ext": "1.55.0",
"@eclipse-theiacloud/monitor-theia": "0.11.1"
},
"devDependencies": {
"@theia/cli": "1.54.0"
"@theia/cli": "1.55.0"
},
"scripts": {
"clean": "theia clean && rimraf node_modules",
Expand Down
2 changes: 1 addition & 1 deletion applications/electron/electron-builder.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ appId: eclipse.theia
productName: TheiaIDE
copyright: Copyright © 2020-2023 Eclipse Foundation, Inc
electronDist: ../../node_modules/electron/dist
electronVersion: 30.4.0
electronVersion: 30.5.1
# 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
102 changes: 52 additions & 50 deletions applications/electron/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
"name": "theia-ide-electron-app",
"description": "Eclipse Theia IDE product",
"productName": "Theia IDE",
"version": "1.54.0",
"version": "1.55.0",
"main": "scripts/theia-electron-main.js",
"license": "MIT",
"author": "Eclipse Theia <[email protected]>",
"homepage": "https://github.com/eclipse-theia/theia-blueprint#readme",
"homepage": "https://github.com/eclipse-theia/theia-ide#readme",
"bugs": {
"url": "https://github.com/eclipse-theia/theia/issues"
},
"repository": {
"type": "git",
"url": "git+https://github.com/eclipse-theia/theia-blueprint.git"
"url": "git+https://github.com/eclipse-theia/theia-ide.git"
},
"engines": {
"yarn": ">=1.7.0 <2",
Expand Down Expand Up @@ -43,7 +43,8 @@
"config": {
"frontendConnectionTimeout": -1,
"startupTimeout": -1,
"resolveSystemPlugins": false
"resolveSystemPlugins": false,
"configurationFolder": ".theia-ide"
}
},
"generator": {
Expand All @@ -53,55 +54,56 @@
}
},
"dependencies": {
"@theia/bulk-edit": "1.54.0",
"@theia/callhierarchy": "1.54.0",
"@theia/console": "1.54.0",
"@theia/core": "1.54.0",
"@theia/debug": "1.54.0",
"@theia/dev-container": "1.54.0",
"@theia/editor": "1.54.0",
"@theia/editor-preview": "1.54.0",
"@theia/electron": "1.54.0",
"@theia/external-terminal": "1.54.0",
"@theia/file-search": "1.54.0",
"@theia/filesystem": "1.54.0",
"@theia/getting-started": "1.54.0",
"@theia/keymaps": "1.54.0",
"@theia/markers": "1.54.0",
"@theia/memory-inspector": "1.54.0",
"@theia/messages": "1.54.0",
"@theia/metrics": "1.54.0",
"@theia/mini-browser": "1.54.0",
"@theia/monaco": "1.54.0",
"@theia/navigator": "1.54.0",
"@theia/outline-view": "1.54.0",
"@theia/output": "1.54.0",
"@theia/plugin-dev": "1.54.0",
"@theia/plugin-ext": "1.54.0",
"@theia/plugin-ext-vscode": "1.54.0",
"@theia/preferences": "1.54.0",
"@theia/process": "1.54.0",
"@theia/property-view": "1.54.0",
"@theia/remote": "1.54.0",
"@theia/scm": "1.54.0",
"@theia/search-in-workspace": "1.54.0",
"@theia/secondary-window": "1.54.0",
"@theia/task": "1.54.0",
"@theia/terminal": "1.54.0",
"@theia/timeline": "1.54.0",
"@theia/toolbar": "1.54.0",
"@theia/typehierarchy": "1.54.0",
"@theia/userstorage": "1.54.0",
"@theia/variable-resolver": "1.54.0",
"@theia/vsx-registry": "1.54.0",
"@theia/workspace": "1.54.0",
"@theia/bulk-edit": "1.55.0",
"@theia/callhierarchy": "1.55.0",
"@theia/collaboration": "1.55.0",
"@theia/console": "1.55.0",
"@theia/core": "1.55.0",
"@theia/debug": "1.55.0",
"@theia/dev-container": "1.55.0",
"@theia/editor": "1.55.0",
"@theia/editor-preview": "1.55.0",
"@theia/electron": "1.55.0",
"@theia/external-terminal": "1.55.0",
"@theia/file-search": "1.55.0",
"@theia/filesystem": "1.55.0",
"@theia/getting-started": "1.55.0",
"@theia/keymaps": "1.55.0",
"@theia/markers": "1.55.0",
"@theia/memory-inspector": "1.55.0",
"@theia/messages": "1.55.0",
"@theia/metrics": "1.55.0",
"@theia/mini-browser": "1.55.0",
"@theia/monaco": "1.55.0",
"@theia/navigator": "1.55.0",
"@theia/outline-view": "1.55.0",
"@theia/output": "1.55.0",
"@theia/plugin-dev": "1.55.0",
"@theia/plugin-ext": "1.55.0",
"@theia/plugin-ext-vscode": "1.55.0",
"@theia/preferences": "1.55.0",
"@theia/process": "1.55.0",
"@theia/property-view": "1.55.0",
"@theia/remote": "1.55.0",
"@theia/scm": "1.55.0",
"@theia/search-in-workspace": "1.55.0",
"@theia/secondary-window": "1.55.0",
"@theia/task": "1.55.0",
"@theia/terminal": "1.55.0",
"@theia/timeline": "1.55.0",
"@theia/toolbar": "1.55.0",
"@theia/typehierarchy": "1.55.0",
"@theia/userstorage": "1.55.0",
"@theia/variable-resolver": "1.55.0",
"@theia/vsx-registry": "1.55.0",
"@theia/workspace": "1.55.0",
"fs-extra": "^9.0.1",
"theia-ide-launcher-ext": "1.54.0",
"theia-ide-product-ext": "1.54.0",
"theia-ide-updater-ext": "1.54.0"
"theia-ide-launcher-ext": "1.55.0",
"theia-ide-product-ext": "1.55.0",
"theia-ide-updater-ext": "1.55.0"
},
"devDependencies": {
"@theia/cli": "1.54.0",
"@theia/cli": "1.55.0",
"@types/js-yaml": "^3.12.0",
"@types/yargs": "17.0.7",
"@wdio/cli": "^6.10.2",
Expand Down
Loading

0 comments on commit 87384da

Please sign in to comment.