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

Fix an automatic rebase against the upstream #156

Merged
merged 14 commits into from
Dec 1, 2022
Merged

Fix an automatic rebase against the upstream #156

merged 14 commits into from
Dec 1, 2022

Conversation

azatsarynnyy
Copy link
Member

What does this PR do?

Fixes an auto-rebase against the upstream.

What issues does this PR fix?

Fixes eclipse-che/che#21854

How to test this PR?

All the PR status checks must be green.

joyceerhl and others added 14 commits November 30, 2022 22:00
@joyceerhl
Add 1-step Continue in Local Folder option (#167795)
f3996b4
@joyceerhl
Report cancellation errors in telemetry (#167799)
7f3301d
@sandy081
Complete fix #166196 (#167805)
cbb2b24
@alexr00
comments.visible should explain how it works with the Comments view (…
7cfb012 
…#167809)

Fixes #167569
@joyceerhl
Do not require manifest.activationEvents to generate implicit event…
329de94 
…s (#167786)
@lszomoru
Git - Fix command name (#167812)
a1f2132 
Fix command name
@jrieken
nullify actionbar and view item context on dispose, remove notebook o…
33b2e92 
…verview ruler on dispose (#167817)

fixes microsoft/vscode#167813
@sandy081
remove critical log level (#167820)
9433821
@alexdima
Take into account resolved extensions and external extensions on all …
040964a 
…extension hosts (not just the remote extension host) (#167826)

Fixes #166857: Take into account resolved extensions and external extensions on all extension hosts (not just the remote extension host)
@alexdima
Revert "Defer updating screen reader content when not in a11y mode" (…
94916c0 
…#167829)

Fixes #165821: Revert "Defer updating screen reader content when not in a11y mode"

This reverts commit ffe90c3.
@alexdima
Improve wording in notification (#167834)
e871aaf 
Fixes #167542: Improve wording in notification
@alexdima
Improve logging to render the extension host kind too (#167836)
cb1f271 
Improve logging to render the extension host kind too (microsoft/vscode-remote-release#7497)
@lszomoru
Git - Update unsafe repositories link (#167832)
55d6b17 
Update unsafe repositories link
@azatsarynnyy
Rebase against the upstream 55d6b17
1b066bd 
vscode-upstream-sha1: 55d6b17
@github-actions
Copy link

github-actions bot commented Dec 1, 2022

Click here to review and test in web IDE: Contribute

@github-actions
Copy link

github-actions bot commented Dec 1, 2022

Click here to review and test in web IDE: Contribute

@azatsarynnyy azatsarynnyy merged commit f522fc4 into main Dec 1, 2022
@azatsarynnyy azatsarynnyy deleted the fix-rebase branch December 1, 2022 14:08
@devstudio-release
Copy link

Build 3.4 :: code_3.x/147: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.4 :: sync-to-downstream_3.x/1492: Console, Changes, Git Data

@che-bot che-bot added this to the 7.58 milestone Dec 1, 2022
@devstudio-release
Copy link

Build 3.4 :: get-sources-rhpkg-container-build_3.x/1480: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.4 :: push-latest-container-to-quay_3.x/1178: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.4 :: push-latest-container-to-quay_3.x/1178: SUCCESS

Copied: code-rhel8; /job/DS_CI/job/update-digests_3.x triggered;
/job/DS_CI/job/Releng/job/copyIIBsToQuay triggered for OCP v4.12 v4.11 v4.10

@devstudio-release
Copy link

Build 3.4 :: update-digests_3.x/1391: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.4 :: copyIIBsToQuay/248: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.4 :: get-sources-rhpkg-container-build_3.x/1480: SUCCESS

code : 3.x :: Build 49331269 : quay.io/devspaces/code-rhel8:3.4-20
SUCCESS; copied to quay; /DS_CI/push-latest-container-to-quay_3.x/1178 triggered

@devstudio-release
Copy link

Build 3.4 :: sync-to-downstream_3.x/1492: SUCCESS

Build container: devspaces-code synced; /DS_CI/get-sources-rhpkg-container-build_3.x/1480 triggered;

@devstudio-release
Copy link

Build 3.4 :: code_3.x/147: SUCCESS

Upstream sync done; /DS_CI/sync-to-downstream_3.x/1492 triggered

@devstudio-release
Copy link

Build 3.4 :: operator-bundle_3.x/582: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.4 :: copyIIBsToQuay/248: SUCCESS

arches = x86_64, s390x, ppc64le;
  * LATEST DS OPERATOR BUNDLE = <a href=https://quay.io/repository/devspaces/devspaces-operator-bundle?tab=tags>registry-proxy.engineering.redhat.com/rh-osbs/devspaces-operator-bundle:3.4-78
  * LATEST DWO OPERATOR BUNDLE = <a href=https://quay.io/repository/devworkspace/devworkspace-operator-bundle?tab=tags>registry-proxy.engineering.redhat.com/rh-osbs/devworkspace-operator-bundle:0.17-2
+ s390x-rhel8 IIB(s) copied:
  + quay.io/devspaces/iib:3.4-v4.12-385581-384944-s390x
  + quay.io/devspaces/iib:3.4-v4.11-385570-384942-s390x
  + quay.io/devspaces/iib:3.4-v4.10-385563-384940-s390x
+ ppc64le-rhel8 IIB(s) copied:
  + quay.io/devspaces/iib:3.4-v4.12-385581-384944-ppc64le
  + quay.io/devspaces/iib:3.4-v4.11-385570-384942-ppc64le
  + quay.io/devspaces/iib:3.4-v4.10-385563-384940-ppc64le
+ x86_64-rhel8 IIB(s) copied:
  + quay.io/devspaces/iib:3.4-v4.12-385581-384944-x86_64
  + quay.io/devspaces/iib:3.4-v4.11-385570-384942-x86_64
  + quay.io/devspaces/iib:3.4-v4.10-385563-384940-x86_64

@devstudio-release
Copy link

Build 3.4 :: sync-to-downstream_3.x/1493: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.4 :: get-sources-rhpkg-container-build_3.x/1481: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.4 :: push-latest-container-to-quay_3.x/1179: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.4 :: copyIIBsToQuay/249: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.4 :: push-latest-container-to-quay_3.x/1179: SUCCESS

Copied: devspaces-operator-bundle; bundle-generated updated;
/job/DS_CI/job/Releng/job/copyIIBsToQuay triggered for OCP v4.12 v4.11 v4.10

@devstudio-release
Copy link

Build 3.4 :: get-sources-rhpkg-container-build_3.x/1481: SUCCESS

devspaces-operator-bundle : 3.x :: Build 49332092 : quay.io/devspaces/devspaces-operator-bundle:3.4-79
SUCCESS; copied to quay; /DS_CI/push-latest-container-to-quay_3.x/1179 triggered

@devstudio-release
Copy link

Build 3.4 :: sync-to-downstream_3.x/1493: SUCCESS

Build container: devspaces-operator-bundle synced; /DS_CI/get-sources-rhpkg-container-build_3.x/1481 triggered; /job/DS_CI/job/dsc_3.x triggered;

@devstudio-release
Copy link

Build 3.4 :: operator-bundle_3.x/582: SUCCESS

Upstream sync done; /DS_CI/sync-to-downstream_3.x/1493 triggered

@devstudio-release
Copy link

Build 3.4 :: dsc_3.x/433: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.4 :: update-digests_3.x/1391: SUCCESS

Detected new images: rebuild operator-bundle
* code; /DS_CI/operator-bundle_3.x/582 triggered

@devstudio-release
Copy link

Build 3.4 :: copyIIBsToQuay/249: SUCCESS

arches = x86_64, s390x, ppc64le;
  * LATEST DS OPERATOR BUNDLE = <a href=https://quay.io/repository/devspaces/devspaces-operator-bundle?tab=tags>registry-proxy.engineering.redhat.com/rh-osbs/devspaces-operator-bundle:3.4-79
  * LATEST DWO OPERATOR BUNDLE = <a href=https://quay.io/repository/devworkspace/devworkspace-operator-bundle?tab=tags>registry-proxy.engineering.redhat.com/rh-osbs/devworkspace-operator-bundle:0.17-2
+ s390x-rhel8 IIB(s) copied:
  + quay.io/devspaces/iib:3.4-v4.12-385581-384944-s390x
  + quay.io/devspaces/iib:3.4-v4.11-385570-384942-s390x
  + quay.io/devspaces/iib:3.4-v4.10-385741-384940-s390x
  + quay.io/devspaces/iib:3.4-v4.10-s390x
  + quay.io/devspaces/iib:next-v4.10-s390x
+ x86_64-rhel8 IIB(s) copied:
  + quay.io/devspaces/iib:3.4-v4.12-385581-384944-x86_64
  + quay.io/devspaces/iib:3.4-v4.11-385570-384942-x86_64
  + quay.io/devspaces/iib:3.4-v4.10-385741-384940-x86_64
  + quay.io/devspaces/iib:3.4-v4.10-x86_64
  + quay.io/devspaces/iib:next-v4.10-x86_64
+ ppc64le-rhel8 IIB(s) copied:
  + quay.io/devspaces/iib:3.4-v4.12-385581-384944-ppc64le
  + quay.io/devspaces/iib:3.4-v4.11-385570-384942-ppc64le
  + quay.io/devspaces/iib:3.4-v4.10-385741-384940-ppc64le
  + quay.io/devspaces/iib:3.4-v4.10-ppc64le
  + quay.io/devspaces/iib:next-v4.10-ppc64le

@devstudio-release
Copy link

Build 3.4 :: dsc_3.x/433: SUCCESS

3.4.0 CI

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RomanNikitenko RomanNikitenko Awaiting requested review from RomanNikitenko RomanNikitenko is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
7.58
Development

Successfully merging this pull request may close these issues.

Che-Code automatic rebase against upstream VS Code is failed
9 participants
@azatsarynnyy @devstudio-release @che-bot @joyceerhl @sandy081 @alexr00 @lszomoru @jrieken @alexdima