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

report and validate concurrent changes #166

Merged
merged 65 commits into from
Mar 9, 2022

Conversation

dennis-behm
Copy link
Member

zAppBuild provides a set of reporting capabilities, which are part of the build framework itself to address some common demands of mainframe development teams.

Developers are particularly interested if:

  • A change of an element impacts other application components which are managed in a different repository, which was contributed via Feature to report external impacts #128
  • Their changes on an isolated feature branch potentially cause a conflict with some concurrent development done by others within the same repository, which is the new contribution with this PR.

This contribution contains:

  • the implementation of the second capability to document and verify conflicts due to concurrent development.
  • a detailed documentation for both reporting features.

@dennis-behm dennis-behm marked this pull request as draft January 31, 2022 16:09
@dennis-behm dennis-behm changed the title report and validate upstream changes report and validate concurrent changes Feb 17, 2022
@dennis-behm dennis-behm marked this pull request as ready for review February 17, 2022 09:28
Copy link
Member

@jbyibm jbyibm left a comment

Choose a reason for hiding this comment

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

I have just some minor comments. I did not test the code.

REPORT.md Outdated
Comment on lines 84 to 85
reportConcurrentChangesGitBranchReferencePatterns=${mainBuildBranch},.*main.*,main,release,feature.*
```
Copy link
Member

Choose a reason for hiding this comment

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

The main branch should be captured by the .main. pattern? So to it is a sort of "dead" pattern?

# typically this is the branch into which changes of the topic branch are planned to be merged into.
#
# sample:
# reportConcurrentChangesGitBranchReferencePatterns=${mainBuildBranch},.*main.*,main,release,feature.*
Copy link
Member

Choose a reason for hiding this comment

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

Same comment main should be captured be .main.

@dennis-behm dennis-behm merged commit 0c80b0f into IBM:develop Mar 9, 2022
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.

3 participants