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

Prepare branch for community release 1.29.x #11712

Closed
wants to merge 2 commits into from
Closed

Prepare branch for community release 1.29.x #11712

wants to merge 2 commits into from

Conversation

martin-fleck-at
Copy link
Contributor

@martin-fleck-at martin-fleck-at commented Sep 29, 2022 •
edited
Loading

What it does

Prepare branch for community release 1.29.x

How to test

Same as release 1.29 plus the following cherry-picked commits: https://github.com/eclipse-theia/theia/issues?q=label%3ACommunityReleasePatch1.29+is%3Aclosed

Review checklist

Reminder for reviewers

msujew and others added 2 commits September 29, 2022 15:06
@msujew @martin-fleck-at
Disable bundleStrings RPC extension (#11636)
680941c
@tortmayr @martin-fleck-at
Restore cancellation token behavior (#11693)
915af2e 
Ensure that cancelling an RPC call does not result in an automatic rejection
on the calling side. Instead the token is passed to the receiving side and
handled there. This restores the cancellation strategy that was used with the
old json-rpc architecture (prior to 1.28).

Contributed on behalf of STMicroelectronics.
@martin-fleck-at martin-fleck-at force-pushed the v.1.29.x-community-release branch from 5149f9f to 915af2e Compare September 29, 2022 13:07
vince-fugnitto
vince-fugnitto requested changes Sep 29, 2022
View reviewed changes
Copy link
Member

@vince-fugnitto vince-fugnitto left a comment

Choose a reason for hiding this comment

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

@martin-fleck-at I don't think we want to merge into release/1.29.0? Should't you just branch off of release/1.29.0, cherry-pick the commits we need and push that branch?

cc @JonasHelming

@martin-fleck-at
Copy link
Contributor Author

@vince-fugnitto You are right, we do not want to merge into release/1.29.0 but I had to choose some base for the PR (to run the CI). The branch itself is https://github.com/eclipse-theia/theia/tree/v.1.29.x-community-release which contains the two commits (+ now the temporary commit with the CI run as it usually only runs on master which I will remove soon). So you only want the branch without PR, is that what you are saying?

@vince-fugnitto
Copy link
Member

vince-fugnitto commented Sep 29, 2022 •
edited
Loading

@martin-fleck-at yea I don't think we need the pr :) Are the changes to the workflow necessary?

@martin-fleck-at
Copy link
Contributor Author

martin-fleck-at commented Sep 29, 2022 •
edited
Loading

@vince-fugnitto No no, not for the actual release, I only did the changes so I could trigger the CI within this PR - I will remove the PR and the workflow changes if everything is green ;-) Sorry for the confusion! Locally everything works fine for me and I also re-tested the 2 cherry picked commits manually but I wanted confirmation from the CI as well.

@martin-fleck-at martin-fleck-at force-pushed the v.1.29.x-community-release branch from ece5d6a to 915af2e Compare September 29, 2022 14:09
@martin-fleck-at
Copy link
Contributor Author

Perfect, the CI is green:
image

Therefore all tests (both mocha and playwright) have been run locally and in the CI. I additionally tested the two cherry-picked PRs manually. So I think the branch is good as it is. I removed the last commit with the workflow changes again, so the branch is ready at: https://github.com/eclipse-theia/theia/tree/v.1.29.x-community-release

@martin-fleck-at
Copy link
Contributor Author

@vince-fugnitto I close this PR now. The community release branch is based on theia/release/1.29.0 with the two PRs mentioned in the description of this PR. If you have any problems, please let me know.

@JonasHelming
Copy link
Contributor

@vince-fugnitto : branch should be ready (see above)

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

@vince-fugnitto vince-fugnitto vince-fugnitto requested changes

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

Successfully merging this pull request may close these issues.
5 participants
@martin-fleck-at @vince-fugnitto @JonasHelming @msujew @tortmayr