Skip to content
This repository has been archived by the owner on Oct 5, 2022. It is now read-only.

add vsx-registry to ci builds #330

Merged
merged 5 commits into from
Apr 13, 2020
Merged

add vsx-registry to ci builds #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3e6873c
add vsx-registry to ci builds
emdfonseca Apr 3, 2020
aa31b4e
Merge branch 'master' into add-vsx-registry
Apr 10, 2020
2d0019b
fix rust build by updating rust channel
emdfonseca Apr 10, 2020
419b405
pin rust channel to nightly-2020-04-10
emdfonseca Apr 10, 2020
7c25846
Merge branch 'master' of git://github.com/theia-ide/theia-apps into a…
emdfonseca Apr 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions theia-cpp-docker/latest.package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
"@theia/typehierarchy": "latest",
"@theia/userstorage": "latest",
"@theia/variable-resolver": "latest",
"@theia/vsx-registry": "latest",
"@theia/workspace": "latest"
},
"resolutions": {
Expand Down
1 change: 1 addition & 0 deletions theia-cpp-docker/next.package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
"@theia/typehierarchy": "next",
"@theia/userstorage": "next",
"@theia/variable-resolver": "next",
"@theia/vsx-registry": "next",
"@theia/workspace": "next"
},
"resolutions": {
Expand Down
3 changes: 2 additions & 1 deletion theia-dart-docker/latest.package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
"@theia/preferences": "latest",
"@theia/preview": "latest",
"@theia/search-in-workspace": "latest",
"@theia/terminal": "latest"
"@theia/terminal": "latest",
"@theia/vsx-registry": "latest"
},
"devDependencies": {
"@theia/cli": "latest",
Expand Down
3 changes: 2 additions & 1 deletion theia-dart-docker/next.package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
"@theia/preferences": "next",
"@theia/preview": "next",
"@theia/search-in-workspace": "next",
"@theia/terminal": "next"
"@theia/terminal": "next",
"@theia/vsx-registry": "next"
},
"devDependencies": {
"@theia/cli": "next",
Expand Down
3 changes: 2 additions & 1 deletion theia-docker/latest.package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"@theia/preferences": "latest",
"@theia/preview": "latest",
"@theia/search-in-workspace": "latest",
"@theia/terminal": "latest"
"@theia/terminal": "latest",
"@theia/vsx-registry": "latest"
},
"devDependencies": {
"@theia/cli": "latest"
Expand Down
3 changes: 2 additions & 1 deletion theia-docker/next.package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"@theia/preferences": "next",
"@theia/preview": "next",
"@theia/search-in-workspace": "next",
"@theia/terminal": "next"
"@theia/terminal": "next",
"@theia/vsx-registry": "next"
},
"devDependencies": {
"@theia/cli": "next"
Expand Down
1 change: 1 addition & 0 deletions theia-full-docker/latest.package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
"@theia/terminal": "latest",
"@theia/userstorage": "latest",
"@theia/variable-resolver": "latest",
"@theia/vsx-registry": "latest",
"@theia/workspace": "latest"
},
"resolutions": {
Expand Down
1 change: 1 addition & 0 deletions theia-full-docker/next.package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"@theia/terminal": "next",
"@theia/userstorage": "next",
"@theia/variable-resolver": "next",
"@theia/vsx-registry": "next",
"@theia/workspace": "next"
},
"resolutions": {
Expand Down
3 changes: 2 additions & 1 deletion theia-go-docker/latest.package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
"@theia/preferences": "latest",
"@theia/preview": "latest",
"@theia/search-in-workspace": "latest",
"@theia/terminal": "latest"
"@theia/terminal": "latest",
"@theia/vsx-registry": "latest"
},
"devDependencies": {
"@theia/cli": "latest",
Expand Down
3 changes: 2 additions & 1 deletion theia-go-docker/next.package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
"@theia/preferences": "next",
"@theia/preview": "next",
"@theia/search-in-workspace": "next",
"@theia/terminal": "next"
"@theia/terminal": "next",
"@theia/vsx-registry": "next"
},
"devDependencies": {
"@theia/cli": "next",
Expand Down
3 changes: 2 additions & 1 deletion theia-java-docker/latest.package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"@theia/plugin-ext-vscode": "latest",
"@theia/preferences": "latest",
"@theia/search-in-workspace": "latest",
"@theia/terminal": "latest"
"@theia/terminal": "latest",
"@theia/vsx-registry": "latest"
},
"theiaPluginsDir": "plugins",
"theiaPlugins": {
Expand Down
3 changes: 2 additions & 1 deletion theia-java-docker/next.package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"@theia/plugin-ext-vscode": "next",
"@theia/preferences": "next",
"@theia/search-in-workspace": "next",
"@theia/terminal": "next"
"@theia/terminal": "next",
"@theia/vsx-registry": "next"
},
"theiaPluginsDir": "plugins",
"theiaPlugins": {
Expand Down
3 changes: 2 additions & 1 deletion theia-python-docker/latest.package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"@theia/preferences": "latest",
"@theia/preview": "latest",
"@theia/search-in-workspace": "latest",
"@theia/terminal": "latest"
"@theia/terminal": "latest",
"@theia/vsx-registry": "latest"
},
"resolutions": {
"vscode-json-languageserver": "1.2.2",
Expand Down
3 changes: 2 additions & 1 deletion theia-python-docker/next.package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"@theia/preferences": "next",
"@theia/preview": "next",
"@theia/search-in-workspace": "next",
"@theia/terminal": "next"
"@theia/terminal": "next",
"@theia/vsx-registry": "next"
},
"resolutions": {
"vscode-json-languageserver": "1.2.2",
Expand Down
2 changes: 1 addition & 1 deletion theia-rust-docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ RUN mkdir -p $RUST_HOME && \
chmod g+rwxs $RUST_HOME
RUN umask 0002 && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /tmp/sh.rustup.rs && sh /tmp/sh.rustup.rs -y

ARG rust_channel=nightly-2019-11-25
ARG rust_channel=nightly-2020-04-10
marcdumais-work marked this conversation as resolved.
Show resolved Hide resolved

# install language server dependencies for theia
RUN . /root/rust/cargo/env && umask 0002 && rustup toolchain install $rust_channel
Expand Down
1 change: 1 addition & 0 deletions theia-rust-docker/next.package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"@theia/userstorage": "next",
"@theia/variable-resolver": "next",
"@theia/workspace": "next",
"@theia/vsx-registry": "next",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems low-risk to keep this change in this untested image, so I am ok to leave this as-is

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I built the rust image locally without any issues so the vsx-registry does not cause any issues. I guess the problem on travis was related to system performance which was causing the tests to take longer than 30s. I didn't investigate into this issue though.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I built the rust image locally without any issues so the vsx-registry does not cause any issues. I guess the problem on travis was related to system performance which was causing the tests to take longer than 30s. I didn't investigate into this issue though.

I think I found the issue: we are still including a deprecated extension for this image: @theia/editorconfig. Long story short, this causes the app never to start, which eventually fails CI.

I'm removing this extension in this WIP PR: #343

"@theia/ext-scripts": "*",
"@theia/cpp-debug": "next"
},
Expand Down
3 changes: 2 additions & 1 deletion theia-swift-docker/latest.package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"@theia/preferences": "latest",
"@theia/preview": "latest",
"@theia/search-in-workspace": "latest",
"@theia/terminal": "latest"
"@theia/terminal": "latest",
"@theia/vsx-registry": "latest"
},
"resolutions": {
"vscode-json-languageserver": "1.2.2",
Expand Down
3 changes: 2 additions & 1 deletion theia-swift-docker/next.package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"@theia/preferences": "next",
"@theia/preview": "next",
"@theia/search-in-workspace": "next",
"@theia/terminal": "next"
"@theia/terminal": "next",
"@theia/vsx-registry": "next"
},
"resolutions": {
"vscode-json-languageserver": "1.2.2",
Expand Down