Crosswalk branching instructions

This page contains a checklist of things that need to be done when creating a new Crosswalk branch (that is, when a new beta branch is created).

Always remember to coordinate whatever you are doing with the rest of the release team and Crosswalk's program management.

In this example, we are creating a new branch for the Crosswalk 11 series.

1. Check with program management and QA and settle on a canary version to promote to beta.

2. Make sure your git checkout is at the exact commit bumping the canary version to the desired one. For example, if version 11.40.277.0 is to be promoted, your checkout must be at the commit made by Crosswalk Release Engineering that says Bump version to 11.40.277.0.

3. Create the new branch in Crosswalk.

   # Assuming you are at the right commit (see above)
   cd src/xwalk
   git branch crosswalk-11
   git push origin crosswalk-11

4. Create a new chromium-crosswalk branch.

   • Make sure the commit your chromium-crosswalk is at corresponds to the right hash (chromium_crosswalk_rev in src/xwalk/DEPS.xwalk).
   • Check Chromium's version number in src/chrome/VERSION.
   • Create the new branch.

   # Assuming you are at the right commit (see above)
   cd src
   git branch crosswalk-11/40.0.2214.28  # "40.0.2214.28" comes from src/chrome/VERSION.
   git push crosswalk-11/40.0.2214.28

5. Create a new v8-crosswalk branch.

   • Make sure the commit your v8-crosswalk is at corresponds to the right hash (v8_crosswalk_rev in src/xwalk/DEPS.xwalk).
   • Create the new branch.

   # Assuming you are at the right commit (see above)
   cd src/v8
   git branch crosswalk-11/40.0.2214.28  # "40.0.2214.28" comes from src/chrome/VERSION.
   git push crosswalk-11/40.0.2214.28

6. Update the value of CROSSWALK_BRANCH_BETA in the bin/build-release.sh script in the master branch.

   • Clone the crosswalk-canary-management repository (talk to the release team to find out how).
   • Create a new beta branch.

   cd /path/to/crosswalk-canary-management
   git branch crosswalk-11 master
   git push origin crosswalk-11

   • Update the value in the script.

   cd /path/to/crosswalk-canary-management
   git checkout master
   $EDITOR bin/build-release.sh
   # edit, edit.
   git add bin/build-release.sh
   git commit -m 'build-release.sh: Crosswalk beta is now crosswalk-11.'
   git push origin master

   • Deploy your changes (talk to the release team to find out how).

7. Trigger the first beta build of this new branch (you must have updated the release scripts as described above).

   ssh $BUILDMASTER
   ./bin/build-release.sh -p crosswalk -t beta -f

8. Bump Crosswalk's version in the master branch. You need to bump the major number in VERSION and the spec files in packaging/. This is one of the very rare cases where it is OK to push without sending a pull request.

   cd src/xwalk
   git checkout master
   $EDITOR VERSION
   git add VERSION
   git commit -m 'Bump major version to 12.'
   git push origin master

9. Update the version information on the website.