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.

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

Provide Projector sources as subtree #89

Merged
merged 7 commits into from
Feb 21, 2022
Merged

Provide Projector sources as subtree #89

merged 7 commits into from
Feb 21, 2022

Conversation

vzhukovs
Copy link
Collaborator

@vzhukovs vzhukovs commented Feb 16, 2022

This changes proposal provides several improvements in build process by providing Projector server and client as dedicated git subtree in the following repository. This subtree will rebase against master branches automatically through the rebase-projector-sources.yml GitHub action. Automatical rebase is performed by cron every 4 hour.

Also each asset that need to be provided to main container build is become independent from the host os as build of each asset is performed in dedicate docker container. So there is no need to have installed java on the host.

As far as devfile-plugin now has the functionality that differs from devfile support it is renamed to che-plugin. This allows us instead of patching the Projector's sources, provide the necessary fixes through the following plugin.

To manual rebase the source code from the host by calling ./projector.sh rebase it is necessary to provide the additional remotes by executing the following git commands from the repository root:

$ git remote add upstream-projector-server https://github.com/JetBrains/projector-server
$ git fetch upstream-projector-server master
$ git remote add upstream-projector-client https://github.com/JetBrains/projector-client
$ git fetch upstream-projector-client master

Patches directory removed as it doesn't need anymore.

Needed for https://issues.redhat.com/browse/CRW-2736

Reviewable changes made for the upstream provided in the following commit: 7c99945

Signed-off-by: Vladyslav Zhukovskyi <vzhukovs@redhat.com>
git-subtree-dir: projector-server
git-subtree-split: 4e3ca8a
git-subtree-dir: projector-client
git-subtree-split: 0666592
Signed-off-by: Vladyslav Zhukovskyi <vzhukovs@redhat.com>
Signed-off-by: Vladyslav Zhukovskyi <vzhukovs@redhat.com>
@vzhukovs vzhukovs merged commit 7c09558 into main Feb 21, 2022
@vzhukovs vzhukovs deleted the CRW-2736 branch February 21, 2022 10:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants