diff --git a/figures/buildbot-effects.png b/figures/buildbot-effects.png new file mode 100644 index 0000000..495231f Binary files /dev/null and b/figures/buildbot-effects.png differ diff --git a/figures/buildbot-nix-qr.png b/figures/buildbot-nix-qr.png new file mode 100644 index 0000000..f9dd985 Binary files /dev/null and b/figures/buildbot-nix-qr.png differ diff --git a/figures/nix-ngi-0.png b/figures/nix-ngi-0.png new file mode 100644 index 0000000..19aa444 Binary files /dev/null and b/figures/nix-ngi-0.png differ diff --git a/figures/numtide-qr.png b/figures/numtide-qr.png new file mode 100644 index 0000000..a907237 Binary files /dev/null and b/figures/numtide-qr.png differ diff --git a/figures/post-build-steps.png b/figures/post-build-steps.png new file mode 100644 index 0000000..f694b62 Binary files /dev/null and b/figures/post-build-steps.png differ diff --git a/figures/redalder-qr.png b/figures/redalder-qr.png new file mode 100644 index 0000000..8376bbe Binary files /dev/null and b/figures/redalder-qr.png differ diff --git a/figures/upstream-qr.png b/figures/upstream-qr.png new file mode 100644 index 0000000..82eb30b Binary files /dev/null and b/figures/upstream-qr.png differ diff --git a/tex/main.tex b/tex/main.tex index 44832a1..7b0b944 100644 --- a/tex/main.tex +++ b/tex/main.tex @@ -2,9 +2,10 @@ \usepackage{graphicx} \usepackage[outputdir=../aux/tex]{minted} -\usepackage[showboxes,absolute,overlay]{textpos} +\usepackage[absolute,overlay]{textpos} \usepackage{tikz} \usepackage{svg} +\usepackage{hyperref} \usetikzlibrary{calc,tikzmark} %% \setbeameroption{show notes on second screen=right} @@ -40,7 +41,7 @@ \item<3>{natively integrates with GitHub and other forges} \item<4>{not a from-scratch project, something that works NOW} \end{itemize} - \note[item]<4>{one temptation is to write everything from scratch. Multiple projects tried this and none of them succeeded. We needed something we can make work today, and iterate over.} + \note[item]{one temptation is to write everything from scratch. Multiple projects tried this and none of them succeeded. We needed something we can make work today, and iterate over.} \end{frame} \begin{frame}{Hydra} @@ -49,7 +50,7 @@ \begin{itemize} \item<2>{heavy-weight, keeps track of every store path} \item<3>{\texttt{nixpkgs} scale CI for \texttt{nixpkgs} scale problems} - \item<4,5>{doesn't integrate well with GitHub/Gitea\only<6>{, especially PRs}} + \item<4,5>{doesn't integrate well with GitHub/Gitea\only<5>{, especially PRs}} \end{itemize} \note[item]{take Hydra, (then flip)} \end{frame} @@ -199,7 +200,9 @@ }; } \end{minted} - {\tiny (not true Nix)} + \begin{textblock}{2.5}(12.5,14.5) + \footnotesize (not true Nix) + \end{textblock} \note[item]{what if you had a flake, like that, and wanted to run CI on it? well, run all the checks in CI!} \end{frame} @@ -279,6 +282,7 @@ services.buildbot-nix.master = { \underlinetikz<5>{topicS}{topicE} \underlinetikz<5>{jobsS}{jobsE} + \underlinetikz<5>{adminsS}{adminsE} \end{frame} \begin{frame}[fragile] @@ -336,17 +340,25 @@ services.buildbot-nix.master = { \begin{frame} \centering - \imagewithtitle{\Large post build steps}{example-image-a} + \imagewithtitle{\Large post build steps}{../figures/post-build-steps.png} +\end{frame} + +\begin{frame}[fragile] + \centering + \begin{minipage}[t][1em]{1.0\linewidth} + \centering {\Large per-repository settings (almost)} + \end{minipage}\\ + \vspace{1.5em} + + \begin{minted}[linenos=true,bgcolor=bg,breaklines,tabsize=2]{toml} +attribute = "checks" +lock_file = "flake.lock" + \end{minted} \end{frame} \begin{frame} \centering - \imagewithtitle{\Large per-repository settings}{example-image-a} -\end{frame} - -\begin{frame} - \centering - \imagewithtitle{\Large per-repository effects with secrets (soon)}{example-image-a} + \imagewithtitle{\Large per-repository effects with secrets (soon)}{../figures/buildbot-effects.png} \end{frame} \begin{frame} @@ -360,15 +372,24 @@ services.buildbot-nix.master = { Get your very own today! (or at the hackday) \end{frame} -\begin{frame} - \centering - \includegraphics[width=0.35\textwidth]{../figures/redalder-qr.png}\hspace{1.5em}% - \includegraphics[width=0.35\textwidth]{../figures/numtide-qr.png} +\begin{frame}[t] + %% \includegraphics[width=0.35\textwidth]{../figures/redalder-qr.png}\hspace{1.5em}% + %% \includegraphics[width=0.35\textwidth]{../figures/numtide-qr.png} - Questions? + \vspace{2.0em} + \begin{minipage}{1.0\textwidth} + \footnotesize + \href{https://redalder.org}{\textbf{redalder.org}} \\ + \href{https://numtide.com}{\textbf{numtide.com}} \\ + \href{https://git.redalder.org/magic\_rb/nixcon2024}{\textbf{git.redalder.org/magic\_rb/nixcon2024}} + \end{minipage} + \vspace{1.5em}\\ + \begin{center} + Questions? \\ + \includegraphics[width=0.50\textwidth]{../figures/buildbot-nix-qr.png} + \end{center} - \includegraphics[width=0.35\textwidth]{../figures/upstream-qr.png}\hspace{1.5em}% - \includegraphics[width=0.35\textwidth]{../figures/buildbot-nix-qr.png} + %% \includegraphics[width=0.35\textwidth]{../figures/upstream-qr.png}\hspace{1.5em}% \end{frame} %% \begin{frame}