This commit is contained in:
Thomas Klaehn 2016-05-17 11:34:25 +02:00
parent eab74f64e5
commit ddefac3f65

View File

@ -155,11 +155,12 @@ are used. Release notes are generated for release candidats and releases.
For release candidats (internal releases) more tags are analyzed. The For release candidats (internal releases) more tags are analyzed. The
definition of the commit tag rules are somewhere in the Polarion :) Because definition of the commit tag rules are somewhere in the Polarion :) Because
the release notes content is taken from the log history of a release branch the release notes content is taken from the log history of a release branch
each commit in it's history has to use tagged commits. As long as the each commit in it's history has to use tagged commits. To show logs only of
release branch is branched off the master only it's own commits and the direct parents (commits on the current release branch and commits on the
master's commits has to be tagged. Figure \ref{fig:git_commit_history} master) the log command\\
illustrates the flow of the log history of the release branch shown in \texttt{git log <first\_commit>..HEAD --first parent master}\\
figure \ref{fig:gitlab_workflow}. can be used. Figure \ref{fig:git_commit_history} illustrates the flow of the
log history of the release branch shown in figure \ref{fig:gitlab_workflow}.
\subsection{Configuring the build jobs} \label{sec:ci_conf} \subsection{Configuring the build jobs} \label{sec:ci_conf}
@ -192,6 +193,3 @@ variables:
SW_MINOR: "2" SW_MINOR: "2"
\end{lstlisting} \end{lstlisting}
\textbf{Remember}, it is a good idea to change these values before creating
the release branch, creating (and pushing) the branch triggers the build of
a release candidate.