Uploaded image for project: 'Nuxeo Platform'
  1. Nuxeo Platform
  2. NXP-13313

Make the package command of release script use branch and tag options

    XMLWordPrintable

    Details

    • Type: Improvement
    • Status: Resolved
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: 5.8.0-HF03, 5.9.1
    • Component/s: Dev Tools

      Description

      From http://qa.nuxeo.org/jenkins/job/nuxeo-master-fullbuild-permanentCheck/3333/console:

      git co test-release-with-tag -q
      
      ./scripts/release.py package -b master --skipTests
      $> git fetch origin
      $> git checkout master -q
      $> git rebase origin/master
      Cannot rebase: You have unstaged changes.
      Please commit or stash them.
      $> git stash
      Saved working directory and index state WIP on master: 37c5f7e Merge branch 'fix-NXP-13268-short-annot'
      HEAD is now at 37c5f7e Merge branch 'fix-NXP-13268-short-annot'
      $> git rebase origin/master
      Current branch master is up to date.
      $> git stash pop -q
      
      Working on Nuxeo main repository...
      Releasing from branch:   master
      Current version:         5.9.1-SNAPSHOT
      Tag:                     release-5.9.1-I20131129_1827
      Next version:            5.9.1-SNAPSHOT
      Maintenance branch deleted
      Tests execution is skipped
      Parameters stored in /home/julien/ws-ssd/release.log
      
      [.]
      $> git fetch origin
      $> git checkout test-release-with-tag -q
      
      Using Maven introspection of the POM file to find the list of modules...
      [addons]
      $> git fetch origin
      $> git checkout --track -b test-release-with-tag origin/test-release-with-tag -q
      fatal: Cannot update paths and switch to branch 'test-release-with-tag' at the same time.
      Did you intend to checkout 'origin/test-release-with-tag' which can not be resolved as commit?
      [ERROR] Command 'git checkout --track -b test-release-with-tag origin/test-release-with-tag -q' returned non-zero exit code (128)

      Issue is the fallback on the current changeset. Options -b and -t should be used to avoid that.

        Attachments

          Issue Links

            Activity

              People

              • Votes:
                0 Vote for this issue
                Watchers:
                2 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved: