Backporting commits from the c7 repo

Development
22

Adjusted the script and added documentation about how to manually resolve conflicts using IntelliJ.

1 Like
23

@javahippie would be really great if you could constantly “digest” these PRs. I can then produce more. Doesn’t make sense to have too many PRs open. I think this way we can get this done within 1 week. :slightly_smiling_face:

24

Hi Julian, thanks again for the work, this is really helpful!

I’m on it, I’m merging them one by one and let the pipeline do it’s thing on the main branch for every MR.

1 Like
25

@Julian I just saw that there seems to be a search / replace issue in the script, as the license headers often state “Operaton licenses this file to you under the Apache…” which is wrong. I’ll fix up the ones I already merged manually

26

Oh, i’ll fix this in the script

27

It’s now fixed: Fix wrong replacement "Operaton licenses" · hauptmedia/c7-commit-rewrite@a5a4135 · GitHub

I can check the open PRs for this issue manually later today

1 Like
28

Luckily the open PRs are not introducing new files so there is no issue there. Thanks for noticing @javahippie

29

@Julian Your script works awesome :star_struck:

1 Like
30

Today was a fantastic merge day! :partying_face: Thanks to everyone for your work and dedication to this project—seriously, it’s paying off. If we keep up this pace, we’ll be able to backport all the commits in the coming days. :dart:

I believe that integrating all useful C7 CE commits until EOL will be a great move for the project, ensuring we keep things robust and up-to-date.

Thanks again, everyone! Let’s keep the momentum going! :rocket:

3 Likes
31

Thank YOU, Julian for doing the work here! Pull Request / Issue 128 was opened today :exploding_head:

32

@Julian Could you fix the following in your script: The commit messages refer to issues from camunda-bpm-platform, but the messages only contain an issue number. This way it can’t be related to the original issue directly.

Example

feat(cockpit): add rootInstanceId filter to humanTask search (#4509)

related to #4315

I think this should be

feat(cockpit): add rootInstanceId filter to humanTask search (camunda/camunda-bpm-platform#4509)

related to camunda/camunda-bpm-platform#4315
1 Like
33

hi @kthoms, i fixed this now rewrite references in commit message · hauptmedia/c7-commit-rewrite@15b809d · GitHub

1 Like
34

Great, thank you. I would expect that newer commits will be able to navigate.

1 Like
35

The c7 backports are now all integrated.

I noticed that the cibseven repo is beginning to create useful patches like this one feat: check sql-indexes in create/drop sql-files during maven test by serge-krot · Pull Request #5 · cibseven/cibseven · GitHub

Made me wonder if we should port these patches, too?

36

I think the code base to that project might diverge pretty soon. Fetching those commits from upstream might work for some time, doing this from another fork might create some hassle pretty soon.

Also I saw that for their tests to work they added a feature which made sure that the tests are running in a certain order, which I think is not ideal.

1 Like
37

I’ve noticed another challenge with the cibseven repository when it comes to backports: the lack of proper documentation. A good example is this recent PR: test: spin: -Duser.timezone=UTC by serge-krot · Pull Request #6 · cibseven/cibseven · GitHub.

Without clear documentation, it becomes difficult to follow the intent behind the changes. This makes it challenging to properly evaluate them, especially when we’re trying to adhere to our 4-eyes check principle for changes.

1 Like