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

Change the logic inheriting BranchConfiguration from parent branch if the IncrementStrategy is set to Inherit #3190

Merged
merged 69 commits into from
Oct 11, 2022

Commits on Sep 9, 2022

  1. The behavior of GitVersion is sometimes not like I would expected it.…

    … Here is my view on it and an example how it might be better. Not all unit tests are adapted right now from me. But this tests I have touched it looks quite good... That means the unit tests might be not correct implemented and false positive (or I have a fundamental different view on generating semantic versions). Hope this finds a way to a productive version of GitVersion because I put a lot of effort to this because I want to give something back. GitVersion is great and should be refactored more in direction of clean code. Thank you very much for given this a chance.
    HHobeck committed Sep 9, 2022
    Configuration menu
    Copy the full SHA
    5c619d6 View commit details
    Browse the repository at this point in the history
  2. Okay I changed the unit and agree on the result. It feels very natura…

    …l like I would expected it. But at one point I'm not certain. That's related how the version should be incremented when having a different VersioningMode ContinuousDelivery, ContinuousDeployment or Mainline. I think I have misinterpreted the parameter TrackMergeTarget and should be using instead the ContinuousDeployment value instead.
    HHobeck committed Sep 9, 2022
    Configuration menu
    Copy the full SHA
    f2ea9df View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3c1e64a View commit details
    Browse the repository at this point in the history
  4. Ignore some failing tests

    HHobeck committed Sep 9, 2022
    Configuration menu
    Copy the full SHA
    0431671 View commit details
    Browse the repository at this point in the history
  5. Fix some tests

    HHobeck committed Sep 9, 2022
    Configuration menu
    Copy the full SHA
    12a6ecc View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2022

  1. Set back the default behavior and change the configuration builder: s…

    …et TrackMergeTarget to true for the main branch.
    HHobeck committed Sep 10, 2022
    Configuration menu
    Copy the full SHA
    2f89159 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    01100f2 View commit details
    Browse the repository at this point in the history
  3. Set back the default behavior and change the configuration builder: s…

    …et TrackMergeTarget to true for the support branch.
    HHobeck committed Sep 10, 2022
    Configuration menu
    Copy the full SHA
    dcec44f View commit details
    Browse the repository at this point in the history
  4. Set back the default behavior and change the configuration builder: s…

    …et TrackMergeTarget to true for the develop branch.
    HHobeck committed Sep 10, 2022
    Configuration menu
    Copy the full SHA
    eac6f01 View commit details
    Browse the repository at this point in the history
  5. Fix WhenPreventIncrementOfMergedBranchVersionIsSetToFalseForDevelopCo…

    …mmitsSinceVersionSourceShouldNotGoDownWhenMergingHotfixToDevelop test
    HHobeck committed Sep 10, 2022
    Configuration menu
    Copy the full SHA
    8f09a85 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2022

  1. Add ConfigBuilder to make it easier in tests to create configuration …

    …instances. In advance add a overload to specify the initial branch name for the empty repository. Last but not least the logic in BaseVersionCalculator has been adapted: If the maximal version has no pre-release tag defined than we want to determine just the latest previous base source which are not comming from pre-release tag.
    HHobeck committed Sep 12, 2022
    Configuration menu
    Copy the full SHA
    c62053b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3c74141 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2022

  1. Modify PreventDecrementationOfVersionsOnTheDevelopBranch and remove T…

    …rackMergeTarget functionality.
    HHobeck committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    937f761 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2022

  1. The way I'm calculating the effective configuration for each base ver…

    …sion strategy implementation is highly recursive and works with inheritance from one branch configuration to another. This makes it highly configurable and we can support every workflow on the world and all workflows which are created in the future. Please notice the BranchConfigurationCalculator is not really used anymore.
    HHobeck committed Sep 15, 2022
    Configuration menu
    Copy the full SHA
    befa745 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ccb9f1f View commit details
    Browse the repository at this point in the history
  3. Run dotnet format

    HHobeck committed Sep 15, 2022
    Configuration menu
    Copy the full SHA
    55c899d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8f226d4 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    4e29b80 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9f12b5b View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    3110909 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    33dc540 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2022

  1. Configuration menu
    Copy the full SHA
    de573a5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a9471d9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    39b1abc View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2022

  1. Move this logic to the class BaseVersionCalculator and change the int…

    …erface of IVersionStrategy to be able to pass in the effective configuration.
    HHobeck committed Sep 17, 2022
    Configuration menu
    Copy the full SHA
    28a9d2b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f982607 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2022

  1. Introduce the concept of fallback and unkown branch configuration. Wh…

    …ich are conceptional not the same. Create additional tests for EffectiveBranchConfigurationFinderTests. In advance the ContinuousDeploymentTestScenarios integration test class has been added.
    HHobeck committed Sep 18, 2022
    Configuration menu
    Copy the full SHA
    7c585f2 View commit details
    Browse the repository at this point in the history
  2. Mastering the integration tests CreatingAFeatureBranchFromAReleaseBra…

    …nch and ContinuousDeploymentTestScenarios.
    HHobeck committed Sep 18, 2022
    Configuration menu
    Copy the full SHA
    da04d3f View commit details
    Browse the repository at this point in the history
  3. Create a new EffectiveBranchConfiguration class which contains the Br…

    …anch and the EffectiveConfiguration values. In advance this properties are now present in the NextVersion class to be prepaired to get rid of the Configuration property in the GitVersionContext class. No business logic has been changed in this commit.
    HHobeck committed Sep 18, 2022
    Configuration menu
    Copy the full SHA
    4475e05 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e43dbf7 View commit details
    Browse the repository at this point in the history
  5. Finally I have changed all calls to GitVersionContext::Configuration …

    …and deleted this property. Therfore I need to pass the NextVersion class out of NextVersionCalculator. Normally the SemanticVersion should be enough. But magic happens in the VariableProvider so that's why the effective configuration of the calculated version is necessary as well. Just refactoring no business logic changed.
    HHobeck committed Sep 18, 2022
    Configuration menu
    Copy the full SHA
    2531495 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    4095244 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2022

  1. Configuration menu
    Copy the full SHA
    260ee92 View commit details
    Browse the repository at this point in the history
  2. EffectiveBranchConfigurationFinder public and remove one integration …

    …test which was a duplicate.
    HHobeck committed Sep 19, 2022
    Configuration menu
    Copy the full SHA
    75f4c37 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2022

  1. Rename GetTargetBranches to GetSourceBranches. Fix some warnings and …

    …document the obsolete code. Remove unused method in RepositoryStore. No business logic changed.
    HHobeck committed Sep 20, 2022
    Configuration menu
    Copy the full SHA
    c6945fc View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e73c92f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6a69dce View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    043264c View commit details
    Browse the repository at this point in the history
  5. Re comment tests in NextVersionCalculatorTests, MergeMessageBaseVersi…

    …onStrategyTests and ConfigNextVersionBaseVersionStrategyTests.
    HHobeck committed Sep 20, 2022
    Configuration menu
    Copy the full SHA
    8f8e665 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    1c9e3cf View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    45cf14f View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2022

  1. Fix some typos

    HHobeck committed Sep 21, 2022
    Configuration menu
    Copy the full SHA
    8e1670f View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2022

  1. Configuration menu
    Copy the full SHA
    1041d07 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5af8026 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b9cf015 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2022

  1. Configuration menu
    Copy the full SHA
    016d5a7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f062817 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2022

  1. Configuration menu
    Copy the full SHA
    a5f3d5e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    74db309 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2425546 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2022

  1. Configuration menu
    Copy the full SHA
    2ba1989 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0080e73 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ff6f27f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    061c06e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    7f0309b View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    fc2e75d View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    42da619 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2022

  1. Removing default values from hotfix branch configuration which should…

    … be inherited from parent.
    HHobeck committed Oct 6, 2022
    Configuration menu
    Copy the full SHA
    f39b551 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2022

  1. Remove FixTheBaseVersionSourceOfMergeMessageStrategyIfReleaseBranchWa…

    …sMergedAndDeleted in NextVersionCalculator and move business logic to MergeMessageVersionStrategy class.
    HHobeck committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    94e2127 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2022

  1. Configuration menu
    Copy the full SHA
    af1bf3f View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2022

  1. Make the effective configuration tag not nullable. Default value for …

    …tag will be present only on fallback branch configuration settings.
    HHobeck committed Oct 11, 2022
    Configuration menu
    Copy the full SHA
    6bd49cd View commit details
    Browse the repository at this point in the history
  2. Change breaking changes file

    HHobeck committed Oct 11, 2022
    Configuration menu
    Copy the full SHA
    4a405c6 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    410c92e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f24f235 View commit details
    Browse the repository at this point in the history
  5. Fix typo in breaking changes

    HHobeck committed Oct 11, 2022
    Configuration menu
    Copy the full SHA
    77095ac View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    32b0398 View commit details
    Browse the repository at this point in the history
  7. Change documentation

    HHobeck committed Oct 11, 2022
    Configuration menu
    Copy the full SHA
    3971272 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    0800edf View commit details
    Browse the repository at this point in the history
  9. Update BREAKING_CHANGES.md

    Co-authored-by: Asbjørn Ulsberg <asbjorn@ulsberg.no>
    HHobeck and asbjornu committed Oct 11, 2022
    Configuration menu
    Copy the full SHA
    1397f03 View commit details
    Browse the repository at this point in the history