Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

  1. Before a release is done, make sure that any issues that are fixed have their fix version setup correctly. Run the following JIRA query to see which resolved issues do not have their fix version set up correctly:

    Code Block
    project = sentry and resolution = fixed and fixVersion is empty
    

    The result of the above query should be empty. If some issues do show up in this query that have been fixed since the last release, please bulk-edit them to set the fix version to '1.27.0'.

  2. Move the unresolved jiras to the next release

    Code Block
    project = sentry and fixVersion = 1.27.0 and status not in( resolved, done, Accepted, Closed)
  3. You can also run the following query to make sure that the issues fixed for the to-be-released version look accurate:

    Code Block
    project = sentry and fixVersion = '1.27.0'
    
  4. Finally, check out the output of the JIRA release note tool to see which JIRAs are included in the release, in order to do a sanity check.

...

  1. Create a release branch
    1. Clone fresh repository copy

      Code Block
      git clone https://git-wip-us.apache.org/repos/asf/sentry.git
      cd sentry
      
    2. Checkout master branch

      Code Block
      git checkout master
      
    3. Check that current HEAD points to commit on which you want to base new  release branch. Checkout particular commit if not.

      Code Block
      git log # Check current branch history. HEAD should point to commit that you want to be base for your release branch
      git checkout abcdef123 # Check out particular commit that should be base for release branch if -^
      
    4. Create new release branch with name "branch-$version"

      Code Block
      git checkout -b branch-1.27.0
      
    5. Update CHANGELOG in the trunk to indicate the changes going into the new version.

      The change list can be swiped from the JIRA release note tool (use the "text" format for the change log). See JIRA Cleanup above to ensure that the release notes generated by this tool are what you are expecting.

    6. Remove -SNAPSHOT from the release branch and commit

      Code Block
      find . -name pom.xml | xargs sed -i "" -e "s/X.Y.0-SNAPSHOT/X.Y.0/"  or  mvn versions:set -DnewVersion=X.Y.0 -DgenerateBackupPoms=false
      git add .
      git commit -m "SENTRY-XXXX: Removing -SNAPSHOT from X.Y release branch"
    7. Check your changes and push new branch to Apache repository

      Code Block
      mvn package -Pdownload-hadoop
      git push origin branch-1.7.0
      
    8. Check that branch was correctly propagated to Apache repository.

  2. Prepare the trunk for next release (TODO: update change log?)

    Code Block
    git checkout master
    find . -name pom.xml | xargs sed -i "" -e "s/1.7.0-SNAPSHOT/1.8.0-SNAPSHOT/"  or  mvn versions:set -DnewVersion=1.8.0-SNAPSHOT -DgenerateBackupPoms=false
    git add .
    git commit -m "SENTRY-XXXX: Preparing for sentry 1.8.0 development"
    git push origin master:master
  3. Send an email announcing new branch

     

    No Format
    To: dev@sentry.incubator.apache.org
    Subject: New release branch 1.7.0
    
    
    I've just created new release branch for upcoming 1.7.0 release.
    Please continue committing to master branch as usual.
    I'll cherry-pick commits to branch-1.7.0 on per needed basis.
    
    
    Thanks,
    $RM

...