@@ -61,4 +61,13 @@ The rapporteur closes the Merge Request CR1.
#### 9. Rapporteur produces a new baseline
In order to produce a new baseline, the rapporteur has to update first the release candidate branch (both history and version number)and then the rapporteur creates a new tag on the release candidate branch (i.e. Release-X) to indicate a new baseline named vX.A.B. A new baseline is autogenerated <mark> and the rapporteur uploads it to the portal.</mark>
The production of a new baseline requires approval from the WG, so a new baseline is prepared as a normal contribution.
The rapporteur:
1. Reserves a contribution in the portal (step 1) following the naming convention **[Spec number]-[Spec title]-vX_A_B_baseline**
1. Creates a new branch (in step 2)
1. Submits changes (usually date, version number and history)(step 3)
1. Creates a merge request (step 4)
1. Uploads a contribution to the portal that contains the newly autogenerated baseline specs (step 5)
1. Follows the normal contribution process (from step 6 onwards)
Once the baseline contribution is approved and merged to the RX branch, the rapporteur creates a new tag on the branch RX named vX.A.B. A new web-based baseline is published in the web-based specifications site (https://specifications.onem2m.org/SPEC-NUMBER).
runPipeline["Run the pipeline for the Merge Request"]
closeMR["Close Merge-request"]
applyMR["Apply Merge-request"]
newBaseline{"New baseline?"}
makeBaseline["Tag release branch"]
baselineContribution["Rapporteur prepares a baseline contribution:<br > Name of the contribution shall follow<br > [WG]-YYYY-NNNN-[Spec number]-vA_B_C_baseline "]
class createBranch,submitChanges,blockContribution,submitContrib,unlockMR,reviseContrib,runPipeline,applyMR,fixConflict,makeBaseline,closeMR gitlab;
class createBranch,submitChanges,blockContribution,submitContrib,unlockMR,reviseContrib,applyMR,fixConflict,makeBaseline,baselineContribution,closeMR gitlab;
start-->reserve
reserve-->createBranch
createBranch-->submitChanges
hasComments-->submitChanges
submitChanges-->isReady
isReady--Ready-->existsMR
existsMR--Yes-->runPipeline
runPipeline-->uploadCR
isReady--Ready-->blockContribution
blockContribution-->existsMR
existsMR--Yes-->uploadCR
existsMR--No-->submitContrib
isReady--"comments or not finished"-->submitChanges
uploadCR-->revision
submitContrib-->blockContribution
blockContribution-->uploadCR
submitContrib-->uploadCR
revision-->approval
approval--Yes-->approve
approval--No-->reject
...
...
@@ -52,7 +51,9 @@ graph TB
conflict--No-->newBaseline
conflict--Yes-->fixConflict
fixConflict-->revision
newBaseline--Yes-->makeBaseline
newBaseline--Yes-->baselineContribution
baselineContribution-->reserve
baselineContribution--When approved and merged-->makeBaseline