f7a64a87b25310b9a30417d209823ccf22135eef
wiki/info/landscape/building-and-deploying.md
| ... | ... | @@ -77,7 +77,7 @@ The following descriptions are based on a situation where an Xmake migration has |
| 77 | 77 | |
| 78 | 78 | For iOS and Android there are two different build processes in place. At this point (2016-02-02) we're only just beginning to understand how things work, and this is an attempt to summarize the technical steps necessary to get the build done and hand things over to the "Final Assembly" department for deployment to the stores. |
| 79 | 79 | |
| 80 | -Our iOS app build is described by the contents of branch ``central-ios-release-build``. We usually merge ``ubilabs--ios--develop`` into ``master`` and then ``master`` into ``central-ios-release-build``. Builds off the latter branch can be tested using [this Jenkins job](https://xmake-mobile-dev.wdf.sap.corp:8443/job/sapsailingcapture-OD-common/). Run a [Build with Parameters](http://dewdfms0036.wdf.sap.corp:8080/job/sapsailingcapture-GIT-DEV-OD-ENTERPRISE/build?delay=0sec) and enter ``central-ios-release-build`` as the TREEISH. Use ``-X 0.9.3-26`` or similar (see [here](https://wiki.wdf.sap.corp/wiki/display/xMake/Release+Notes+-+xmake) for the latest version) in the "Build Options" field to specify the latest version of Xmake. The build should succeed and produce the .ipa file somewhere in the [build's target Maven repository](http://dewdfms0036.wdf.sap.corp:8080/job/sapsailingcapture-GIT-DEV-OD-ENTERPRISE/ws/.m2/repository/com/sap/sailing/mobile/ios/SAPTracker/). |
|
| 80 | +Our iOS app build is described by the contents of branch ``central-ios-release-build``. We usually merge ``ubilabs--ios--develop`` into ``master`` and then ``master`` into ``central-ios-release-build``. Builds off the latter branch can be tested using [this Jenkins job](https://xmake-mobile-dev.wdf.sap.corp:8443/job/sapsailingcapture-OD-common/). Run a [Build with Parameters](https://xmake-mobile-dev.wdf.sap.corp:8443/job/sapsailingcapture-OD-common/build?delay=0sec) and enter ``central-ios-release-build`` as the TREEISH. Use ``-X 0.9.3-26`` or similar (see [here](https://wiki.wdf.sap.corp/wiki/display/xMake/Release+Notes+-+xmake) for the latest version) in the "Build Options" field to specify the latest version of Xmake. The build should succeed and produce the .ipa file somewhere in the [build's target Maven repository](http://dewdfms0036.wdf.sap.corp:8080/job/sapsailingcapture-GIT-DEV-OD-ENTERPRISE/ws/.m2/repository/com/sap/sailing/mobile/ios/SAPTracker/). |
|
| 81 | 81 | |
| 82 | 82 | When the test build was successful, the branch contents need to be merged into the central git repository's branch ``fa/rel-1.x``, e.g., ``fa/rel-1.0``. Pushing immediately to this branch to the SAP-internal git is not permitted by Gerrit rules. Instead, it is necessary to push to ``refs/for/fa/rel-1.x``. Furthermore, the commit to be pushed needs to have a ``Change-Id:`` and a ``CR-Id:`` tag in the commit's comment. The ``Change-Id:`` is produced by a commit hook that can be installed in each developer's local git environment by using the following command: |
| 83 | 83 |