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 #21727

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

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

azatsarynnyy opened this issue Sep 26, 2022 · 0 comments · Fixed by che-incubator/che-code#119
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/3125342672

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/3125342672/jobs/5069612796#step:7:2).[3](https://github.com/che-incubator/che-code/actions/runs/3125342672/jobs/5069612796#step:7:3)7.3
⚠️  There are conflicting files, trying to solve...
 ➡️  Analyzing conflict for code/remote/yarn.lock
  ⚙️ reworking code/remote/yarn.lock...
yarn install v1.22.19
[1/[4](https://github.com/che-incubator/che-code/actions/runs/3125342672/jobs/5069612796#step:7:5)] Resolving packages...
[2/4] Fetching packages...
[3/4] Linking dependencies...
warning "@microsoft/1ds-core-js > @microsoft/applicationinsights-core-js@2.8.4" has unmet peer dependency "tslib@*".
warning Ignored scripts due to flag.
[4/4] Building fresh packages...
success Saved lockfile.
Done in 3.[6](https://github.com/che-incubator/che-code/actions/runs/3125342672/jobs/5069612796#step:7:7)[9](https://github.com/che-incubator/che-code/actions/runs/3125342672/jobs/5069612796#step:7:10)s.
 ➡️  Analyzing conflict for code/src/vs/code/browser/workbench/workbench.ts
code/src/vs/code/browser/workbench/workbench.ts file cannot be automatically rebased. Aborting
Error: Process completed with exit code 1.

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 kind/task Internal things, technical debt, and to-do tasks to be performed. severity/P1 Has a major impact to usage or development of the system. team/editors area/editor/vscode Issues related to the Code OSS editor of Che labels Sep 26, 2022
@azatsarynnyy azatsarynnyy added this to the 7.55 milestone Sep 26, 2022
@azatsarynnyy azatsarynnyy mentioned this issue Sep 26, 2022
Merged
@azatsarynnyy azatsarynnyy mentioned this issue Sep 27, 2022
Closed
59 tasks
@azatsarynnyy azatsarynnyy self-assigned this Sep 27, 2022
@azatsarynnyy azatsarynnyy added severity/blocker Causes system to crash and be non-recoverable or prevents Che developers from working on Che code. and removed severity/P1 Has a major impact to usage or development of the system. labels 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