Back porting Alloy to Liferay Portal

Alloy Backporting Process

Overview

This document explains how to backport Alloy UI releases into liferay-portal and liferay-portal-ee repos.

Liferay Portal have liferay-portal and liferay-portal-ee repositories that are using releases of Alloy repositories alloy-ui and alloy-ui-ee, respectively.

Alloy versions to Liferay compatibility table

Alloy Version	Liferay Version
alloy-ui	liferay-portal
alloy-ui/1.5.x	liferay-portal/6.1.x
alloy-ui-ee/ee-1.5.x	liferay-portal-ee/ee-6.1.x
alloy-ui-ee/ee-1.0.x	liferay-portal-ee/ee-6.0.x

Backporting alloy-ui/1.5.x into liferay-portal/6.1.x

Syncing alloy-ui/1.5.x branch

• Access alloy-ui repository

    cd alloy-ui
  

• Create a new branch or rebase with upstream/1.5.x:

    git fetch upstream 1.5.x:1.5.x
    git checkout 1.5.x
    git pull --rebase upstream 1.5.x
    git merge master ( until now, 1.5.x is equals to master )
  

• Push changes to your origin and upstream:

    git push origin 1.5.x
    git push upstream 1.5.x ( if you have permissions )
  

• Release a new alloy-1.5.x.zip to be copied to the third-party folder on liferay:

    ant release
  

Updating Alloy on liferay-portal/6.1.x branch

• Access liferay-portal repository

    cd liferay-portal
  

• Rebase or create a new branch based on upstream/6.1.x and copy the released alloy 1.5.x to the third-party folder:

    git fetch upstream 6.1.x:6.1.x
    git checkout 6.1.x
    git pull --rebase upstream 6.1.x
    git push origin 6.1.x 
    git checkout -b LPS-XXX-update-alloy
    cp alloy-ui/alloy-1.5.0.zip portal-web/third-party
  

• Test if Alloy is working fine on Liferay.

• Commit the new zip file. Note: Replace 1d20fc8 with the latest commit hash id ( on alloy-ui repository run git rev-parse --short --verify HEAD to retrieve the latest hash id ):

    git add portal-web/third-party/alloy-1.5.0.zip
    git commit -a -m "Updating Alloy to `1d20fc8`; LPS-XXX"
  

• Submit the pull request to natecavanaugh or eduardolundgren under 6.1.x branch:

    gitpr submit --reviewer=natecavanaugh -b 6.1.x
  

Backporting alloy-ui-ee/ee-1.5.x into liferay-portal-ee/ee-6.1.x

Syncing alloy-ui-ee/ee-1.5.x branch

• Access alloy-ui-ee repository

    cd alloy-ui-ee
  

• Add alloy-ui https://github.com/liferay/alloy-ui.git remote repository:

    git remote add alloy https://github.com/liferay/alloy-ui.git
  

• Rebase alloy-ui-ee/master with aloy-ui/master

    git pull --rebase alloy-ui master
  

• Push changes to your origin and upstream:

    git push origin master
    git push upstream master ( if you have permissions )
  

• Create a new branch or rebase with upstream/ee-1.5.x:

    git fetch upstream ee-1.5.x:ee-1.5.x
    git checkout ee-1.5.x
    git pull --rebase upstream ee-1.5.x
    git merge master ( until now, 1.5.x is equals to master )
  

• After git merge master, resolve possible conflicts and commit the merge.

• Push changes to your origin and upstream:

    git push origin ee-1.5.x
    git push upstream ee-1.5.x ( if you have permissions )
  

• Release a new alloy-1.5.x.zip to be copied to the third-party folder on liferay:

    ant release
  

Updating Alloy on liferay-portal-ee/ee-6.1.x branch

• Access liferay-portal repository

    cd liferay-portal-ee
  

• Rebase or create a new branch based on upstream/6.1.x and copy the released alloy 1.5.x to the third-party folder:

    git fetch upstream ee-6.1.x:ee-6.1.x
    git checkout ee-6.1.x
    git pull --rebase upstream ee-6.1.x
    git push origin ee-6.1.x 
    git checkout -b LPS-XXX-update-alloy
    cp alloy-ui/alloy-1.5.0.zip portal-web/third-party
  

• Test if Alloy is working fine on Liferay.

• Commit the new zip file. Note: Replace 1d20fc8 with the latest commit hash id ( on alloy-ui repository run git rev-parse --short --verify HEAD to retrieve the latest hash id ):

    git add portal-web/third-party/alloy-1.5.0.zip
    git commit -a -m "Updating Alloy to 1d20fc8; LPS-XXX"
  

• Submit the pull request to natecavanaugh or eduardolundgren under 6.1.x branch:

    gitpr submit --reviewer=natecavanaugh -b ee-6.1.x
  

Backporting alloy-ui-ee/ee-1.0.x into liferay-portal-ee/ee-6.0.x

Syncing alloy-ui-ee/ee-1.0.x branch

• Access liferay-portal repository

    cd alloy-ui-ee
  

• Add alloy-ui https://github.com/liferay/alloy-ui.git remote repository:

    git remote add alloy https://github.com/liferay/alloy-ui.git
  

• Rebase alloy-ui-ee/master with aloy-ui/master

    git pull --rebase alloy-ui master
  

• Push changes to your origin and upstream:

    git push origin master
    git push upstream master ( if you have permissions )
  

• Create a new branch or rebase with upstream/ee-1.5.x:

    git fetch upstream ee-1.0.x:ee-1.0.x
    git checkout ee-1.0.x --force
    git pull --rebase upstream ee-1.0.x
  

• Cherry pick the commits from master you want to add to ee-1.0.x.

• After cherry-pick, resolve possible conflicts and commit the merge.

• Push changes to your origin and upstream:

    git push origin ee-1.0.x
    git push upstream ee-1.0.x ( if you have permissions )
  

• Release a new alloy-1.0.x.zip to be copied to the third-party folder on liferay:

    ant release
  

Updating Alloy on liferay-portal-ee/ee-6.0.x branch

• Access liferay-portal repository

    cd liferay-portal-ee
  

• Rebase or create a new branch based on upstream/6.0.x and copy the released alloy 1.0.x to the third-party folder:

    git fetch upstream ee-6.0.x:ee-6.0.x
    git checkout ee-6.0.x
    git pull --rebase upstream ee-6.0.x
    git push origin ee-6.0.x 
    git checkout -b LPS-XXX-update-alloy
    cp alloy-ui/alloy-1.0.0.zip portal-web/third-party
  

• Test if Alloy is working fine on Liferay.

• Commit the new zip file. Note: Replace 1d20fc8 with the latest commit hash id ( on alloy-ui repository run git rev-parse --short --verify HEAD to retrieve the latest hash id ):

    git add portal-web/third-party/alloy-1.0.0.zip
    git commit -a -m "Updating Alloy to 1d20fc8; LPS-XXX"
  

• Submit the pull request to natecavanaugh or eduardolundgren under 6.1.x branch:

    gitpr submit --reviewer=natecavanaugh -b ee-6.0.x