Commit 578b1108 authored by Lukas Nagel's avatar Lukas Nagel
Browse files

show github workflow with graphic

parent 03c7d924
...@@ -14,7 +14,8 @@ versionsgraph=\ ...@@ -14,7 +14,8 @@ versionsgraph=\
merge-three-way.pdf \ merge-three-way.pdf \
all=\ all=\
$(versionsgraph) $(versionsgraph) \
github-workflow.pdf
default: $(all) default: $(all)
......
\documentclass[border=0.5cm]{standalone}
\usepackage{fontawesome}
\usepackage{tikz}
\usetikzlibrary{positioning}
\usetikzlibrary{backgrounds}
\usetikzlibrary{fit}
\input{theme}
\newcommand\repo[7]{
\node[box, #7, draw=nontext] (#1-header) {#3 \tt #2};
\node[box, below=0 of #1-header] (#1-label) {#4es Repository};
\node[box, font=\bfseries, text=black!90, below=0 of #1-label] (#1-role) {#5};
\begin{pgfonlayer}{background}
\node[rectangle, #6, inner sep=0, draw=nontext, fit=(#1-header)(#1-label)(#1-role)] (#1) {};
\end{pgfonlayer}
}
\tikzstyle{flow}=%
[ ->
, line width=2pt
, draw=nontext
, font=\tt
, every node/.append style={midway}
]
\tikzstyle{step}=%
[ circle
, text=black
, fill=black!10
, draw=nontext
, left=0cm of #1
, minimum width=0.6cm
, inner sep=0mm
, font=\tt\Large
]
\tikzstyle{box}=%
[ rectangle
, minimum width=4cm
]
\begin{document}
\begin{tikzpicture}%
[ node distance=5.25cm
, line width=0.2mm
]
\repo{maint-pub}{alice/bogo}{\faGithub}{Öffentlich}{Maintainer}%
{fill=lightgreen}{}
\repo{contr-pub}{bob/bogo}{\faGithub}{Öffentlich}{Contributor}%
{fill=lightblue}{right=of maint-pub-header}
\repo{maint-pri}{bogo}{\faDesktop}{Privat}{Maintainer}%
{fill=lightgreen!50}{below=of maint-pub-header}
\repo{contr-pri}{bogo}{\faDesktop}{Privat}{Contributor}%
{fill=lightblue!50}{below=of contr-pub-header}
\draw[flow, transform canvas={yshift=0.5cm}]
(maint-pub) to node[above] (1) {fork} (contr-pub);
\draw[flow, transform canvas={xshift=1cm}]
(contr-pub) to node[right=0.5cm] (2) {clone} (contr-pri);
\draw[flow]
(contr-pri) to[loop below] node[below] (3) {commit} ();
\draw[flow, transform canvas={xshift=-1cm}]
(contr-pri) to node[right=0.5cm] (4) {push} (contr-pub);
\draw[flow, transform canvas={yshift=-.5cm}]
(contr-pub) to node[above] (5) {Pull Request} (maint-pub);
\draw[flow, transform canvas={xshift=-1cm}]
(maint-pub) to node[right=0.5cm] (6) {pull} (maint-pri);
\draw[flow]
(maint-pri) to[loop below] node[below] (7) {merge} ();
\draw[flow, transform canvas={xshift=1cm}]
(maint-pri) to node[right=0.5cm] (8) {push} (maint-pub);
\node[step=1, yshift= 0.5cm] {1};
\node[step=2, xshift= 1.0cm] {2};
\node[step=3 ] {3};
\node[step=4, xshift=-1.0cm] {4};
\node[step=5, yshift=-0.5cm] {5};
\node[step=6, xshift= 1.0cm] {6};
\node[step=7 ] {7};
\node[step=8, xshift=-1.0cm] {8};
\end{tikzpicture}
\end{document}
...@@ -83,7 +83,9 @@ ...@@ -83,7 +83,9 @@
\item Zeiger wird mit jedem Commit vorwärts bewegt \item Zeiger wird mit jedem Commit vorwärts bewegt
\end{itemize} \end{itemize}
\center \center
\huge\alert{Grafik: Versionsgraph} \begin{figure}
\includegraphics{../grafiken/ex4-graph}
\end{figure}
\end{frame} \end{frame}
% %
...@@ -470,14 +472,10 @@ ...@@ -470,14 +472,10 @@
\begin{frame} \begin{frame}
\frametitle{\subsecname} \frametitle{\subsecname}
GitHub nutzt zum Beitragen primär Forks und Pullrequests GitHub nutzt zum Beitragen primär Forks und Pullrequests
\begin{itemize} \center
\item Forken legt kopie des Projekts im Nutzernamensraum an \begin{figure}
\item Dieser Fork wird dann geklont bzw als remote hinzugefügt \includegraphics{../grafiken/github-workflow}
\item Um commits ins Hauptrepo zu übernehemen kann eine Pullrequest erstellt werden \end{figure}
\item Alle nutzer können Pullrequests Kommentare hinterlassen
\item Der Maintainer des Hauptepos kann die Pullrequests mergen odeschließen
\end{itemize}
\center{\Huge An Grafik Zeigen}
\end{frame} \end{frame}
\section{Fazit} \section{Fazit}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment