Skip to content
This repository has been archived by the owner on Apr 4, 2023. It is now read-only.

Adaptate terminal to the upstream #652

Merged
merged 4 commits into from
Mar 4, 2020
Merged

Adaptate terminal to the upstream #652

merged 4 commits into from
Mar 4, 2020

Conversation

AndrienkoAleksandr
Copy link
Contributor

@AndrienkoAleksandr AndrienkoAleksandr commented Mar 4, 2020 •
edited by RomanNikitenko
Loading

What does this PR do?

none.

What issues does this PR fix or reference?

eclipse-che/che#16212

Fix terminal compilation after upstream changes: eclipse-theia/theia#7121

Signed-off-by: Oleksandr Andriienko [email protected]

@AndrienkoAleksandr
Adaptate terminal to the upstream
023ed19 
Signed-off-by: Oleksandr Andriienko <[email protected]>
@vzhukovs
Copy link
Contributor

vzhukovs commented Mar 4, 2020

Linked issue in che-theia: eclipse-che/che#16212

@vzhukovs
Copy link
Contributor

vzhukovs commented Mar 4, 2020

Let's wait until eclipse-theia/theia#7121 will be merged

RomanNikitenko
RomanNikitenko reviewed Mar 4, 2020
View reviewed changes
Copy link
Member

@RomanNikitenko RomanNikitenko left a comment •
edited
Loading

Choose a reason for hiding this comment

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

@AndrienkoAleksandr
thank you very much for the fix!

terminal extension has dependency: "xterm": "3.9.2",
I guess it should be changed.

@AndrienkoAleksandr
Copy link
Contributor Author

terminal extension has dependency: "xterm": "3.9.2",

Thanks for comment. I think current yarn which we are using skip this version and use upstream xterm... So we can remove this version from package.json. It is transitive dependency for us. When theia ci complete work I will update yarn.lock.

@RomanNikitenko
Copy link
Member

should we replace import by 'xterm/css/xterm.css'?
wdyt?

@AndrienkoAleksandr
Copy link
Contributor Author

'xterm/css/xterm.css'

Nice catch. I tested - styles correctly applied and they are working. So I think it works from upstream code and I guess we can skip injection this styles, but I will take a look.

@RomanNikitenko
Copy link
Member

So we can remove this version from package.json.

So I think it works from upstream code and I guess we can skip injection this styles, but I will take a look.

Please remove import and dependency within the current PR if they are not required for che-theia
thank you!

@eclipse-che eclipse-che deleted a comment from che-bot Mar 4, 2020
@AndrienkoAleksandr
Remove unused code. Update yarn.lock.
c57cdff 
Signed-off-by: Oleksandr Andriienko <[email protected]>
RomanNikitenko
RomanNikitenko reviewed Mar 4, 2020
View reviewed changes
generator/tests/init-sources/assembly-example/configs/root-compilation.tsconfig.json Outdated
},
{
"path": "../examples/assembly/compile.tsconfig.json"
},
Copy link
Member

Choose a reason for hiding this comment

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

these changes are the result of eclipse-che/che#15916
it's very annoying bug...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK then -> #655

@azatsarynnyy
Copy link
Member

crw-ci-test

@eclipse-che eclipse-che deleted a comment from che-bot Mar 4, 2020
@che-bot
Copy link
Contributor

che-bot commented Mar 4, 2020

❌ E2E Happy path tests failed ❗

Try Che-Theia editor only Try Che-Theia with Java/maven example Try Che-Theia with NodeJs example

See Details

name link
che-theia docker.io/maxura/che-theia:652
che-theia-endpoint-runtime-binary docker.io/maxura/che-theia-endpoint-runtime-binary:652

Tested with Eclipse Che Single User on K8S (minikube v1.1.1)

⚠️ https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

ℹ️ Use comment "crw-ci-test" to rerun happy path E2E test.

@eclipse-che eclipse-che deleted a comment from che-bot Mar 4, 2020
@che-bot
Copy link
Contributor

che-bot commented Mar 4, 2020

❌ E2E Happy path tests failed ❗

Try Che-Theia editor only Try Che-Theia with Java/maven example Try Che-Theia with NodeJs example

See Details

name link
che-theia docker.io/maxura/che-theia:652
che-theia-endpoint-runtime-binary docker.io/maxura/che-theia-endpoint-runtime-binary:652

Tested with Eclipse Che Single User on K8S (minikube v1.1.1)

⚠️ https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

ℹ️ Use comment "crw-ci-test" to rerun happy path E2E test.

@che-bot
Copy link
Contributor

che-bot commented Mar 4, 2020

❌ E2E Happy path tests failed ❗

Try Che-Theia editor only Try Che-Theia with Java/maven example Try Che-Theia with NodeJs example

See Details

name link
che-theia docker.io/maxura/che-theia:652
che-theia-endpoint-runtime-binary docker.io/maxura/che-theia-endpoint-runtime-binary:652

Tested with Eclipse Che Single User on K8S (minikube v1.1.1)

⚠️ https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

ℹ️ Use comment "crw-ci-test" to rerun happy path E2E test.

@azatsarynnyy
Copy link
Member

[ci-build]

@azatsarynnyy azatsarynnyy merged commit cf2cec6 into master Mar 4, 2020
@azatsarynnyy azatsarynnyy mentioned this pull request Mar 4, 2020
Closed
@azatsarynnyy azatsarynnyy deleted the adapteTerminalToUpstream branch March 4, 2020 19:08
vinokurig pushed a commit that referenced this pull request Apr 6, 2021
@sunix
Adding new 0.1.17 vscode-didact plugin (#652)
eebae8e 
* Adding new 0,1,17 vscode-didact plugin

Signed-off-by: sutan-1 <[email protected]>

* Update vscode-extensions.json with new vscode-didact version
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@RomanNikitenko RomanNikitenko RomanNikitenko approved these changes

@mmorhun mmorhun mmorhun approved these changes

@vzhukovs vzhukovs vzhukovs approved these changes

@azatsarynnyy azatsarynnyy Awaiting requested review from azatsarynnyy

@benoitf benoitf Awaiting requested review from benoitf

Assignees

@AndrienkoAleksandr AndrienkoAleksandr

Labels
kind/task
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@AndrienkoAleksandr @vzhukovs @RomanNikitenko @azatsarynnyy @che-bot @mmorhun