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

make Mage::getOpenMageVersionInfo() more stable for the release process #1459

Merged
merged 1 commit into from
Feb 16, 2021

Conversation

Flyingmana
Copy link
Contributor

@Flyingmana Flyingmana commented Feb 13, 2021

This code construct is to make merging for forward porting of changes easier.
By having the version numbers of different branches in own lines, they do not provoke a merge conflict
also as releases are usually done together, this could in theory be done at once.
The major Version then needs to be only changed once per branch.

to visualize the current situation, this is the diff view of v20.0.6

Tags: v20.0.6
Parent: f7b3c521d9b8d0243aaf2d28cd07650442aec345 (Merge tag 'v19.4.9' into 20.0)
Parent: f0b8bba9820b6f21e9eca4f1563f08c40b5a8c45 (bump version)
Branch: 
Follows: 
Precedes: 

    Merge tag 'v19.4.10' into 20.0

--------------------------------- app/Mage.php ---------------------------------
index 3b07c4ee1d,bbc002b021..7eda7547dd
@@@ -210,15 -210,15 +210,15 @@@ final class Mag
       *
       * @return array
       */
      public static function getOpenMageVersionInfo()
      {
          return array(
 -            'major'     => '19',
 -            'minor'     => '4',
 -            'patch'     => '10',
 +            'major'     => '20',
 +            'minor'     => '0',
-             'patch'     => '5',
++            'patch'     => '6',
              'stability' => '', // beta,alpha,rc
              'number'    => '', // 1,2,3,0.3.7,x.7.z.92 @see https://semver.org/#spec-item-9
          );
      }
  
      /**

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All automated tests passed successfully (all builds are green)

@github-actions github-actions bot added the Mage.php Relates to app/Mage.php label Feb 13, 2021
@colinmollenhour
Copy link
Member

Nice idea, looks good to me.

@Flyingmana Flyingmana merged commit 39f9b0e into OpenMage:1.9.4.x Feb 16, 2021
@Flyingmana Flyingmana deleted the patch-7 branch February 16, 2021 22:22
@github-actions
Copy link
Contributor

Unit Test Results

1 files  ±0  1 suites  ±0   0s ⏱️ ±0s
0 tests ±0  0 ✔️ ±0  0 💤 ±0  0 ❌ ±0 
2 runs  ±0  2 ✔️ ±0  0 💤 ±0  0 ❌ ±0 

Results for commit 39f9b0e. ± Comparison against base commit 2310733.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Mage.php Relates to app/Mage.php
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants