Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Che-Code automatic rebase against upstream VS Code is failed #21730

Closed
azatsarynnyy opened this issue Sep 27, 2022 · 0 comments · Fixed by che-incubator/che-code#121
Closed

Che-Code automatic rebase against upstream VS Code is failed #21730

azatsarynnyy opened this issue Sep 27, 2022 · 0 comments · Fixed by che-incubator/che-code#121
Assignees
@azatsarynnyy
Labels
area/editor/vscode Issues related to the Code OSS editor of Che kind/task Internal things, technical debt, and to-do tasks to be performed. severity/blocker Causes system to crash and be non-recoverable or prevents Che developers from working on Che code.
Milestone
7.55

Comments

@azatsarynnyy
Copy link
Member

Is your task related to a problem? Please describe

The GitHub Workflow for Che-Code automatic rebase against upstream VS Code is failed:
https://github.com/che-incubator/che-code/actions/runs/3134205768/jobs/5088471187

Run ./rebase.sh
  ./rebase.sh
  shell: /usr/bin/bash -e {0}
Using git /usr/bin/git git version [2](https://github.com/che-incubator/che-code/actions/runs/3134205768/jobs/5088471187#step:7:2).[3](https://github.com/che-incubator/che-code/actions/runs/3134205768/jobs/5088471187#step:7:3)7.3
⚠️  There are conflicting files, trying to solve...
 ➡️  Analyzing conflict for code/src/vs/platform/remote/browser/browserSocketFactory.ts
  ⚙️ reworking code/src/vs/platform/remote/browser/browserSocketFactory.ts...
sed: can't read .bak: No such file or directory
Error: Process completed with exit code 2.

Describe the solution you'd like

Fix the incompatibility with the upstream.

Describe alternatives you've considered

No response

Additional context

No response
@azatsarynnyy azatsarynnyy added severity/blocker Causes system to crash and be non-recoverable or prevents Che developers from working on Che code. kind/task Internal things, technical debt, and to-do tasks to be performed. team/editors area/editor/vscode Issues related to the Code OSS editor of Che labels Sep 27, 2022
@azatsarynnyy azatsarynnyy added this to the 7.55 milestone Sep 27, 2022
This was referenced Sep 27, 2022
Closed
Merged
@azatsarynnyy azatsarynnyy self-assigned this Sep 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@azatsarynnyy azatsarynnyy

Labels
area/editor/vscode Issues related to the Code OSS editor of Che kind/task Internal things, technical debt, and to-do tasks to be performed. severity/blocker Causes system to crash and be non-recoverable or prevents Che developers from working on Che code.
Projects
None yet
Milestone
7.55
Development

Successfully merging a pull request may close this issue.

Fix an automatic rebase against the upstream che-incubator/che-code
1 participant
@azatsarynnyy