From 593ee60d70bd35307c5421c710e028a99787f18a Mon Sep 17 00:00:00 2001
From: Philipp Schuster <phip1611@gmail.com>
Date: Mon, 8 Jan 2024 18:12:20 +0100
Subject: [PATCH] github: modernize and format CI file

---
 .editorconfig               |  3 ++
 .github/workflows/build.yml | 99 +++++++++++++++++++++----------------
 2 files changed, 59 insertions(+), 43 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index a630245..aeafdb6 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -13,5 +13,8 @@ trim_trailing_whitespace = true
 [Makefile]
 indent_style = tab
 
+[*.yml]
+indent_size = 2
+
 [*.tex]
 max_line_length = 100
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fecfcbb..d00f177 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,48 +1,61 @@
 name: "Build"
 on:
-    pull_request:
-    push:
+  pull_request:
+  push:
+  merge_group:
+
 jobs:
-    # uses nix
-    nix_build:
-        runs-on: ubuntu-latest
-        steps:
-            -   uses: actions/checkout@v2.3.4
-            -   uses: cachix/install-nix-action@v17
-            -   run: nix-build
-            #   -s: test if this is a file and if it has a size.
-            -   run: test -s result/diplom.pdf
+  # Builds the Nix derivation.
+  nix_build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v24
+      - uses: DeterminateSystems/magic-nix-cache-action@main
+      - run: nix-build
+      #   -s: test if this is a file and if it has a size.
+      - run: test -s result/diplom.pdf
+
+  # Tests the regular build but with a toolchain from the Nix shell.
+  nix_shell:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v24
+      - uses: DeterminateSystems/magic-nix-cache-action@main
+      - run: nix-shell --run "make"
+      - run: nix-shell --run "make stats"
 
-    # uses latexmk
-    regular_build:
-        runs-on: ubuntu-latest
-        steps:
-            -   name: Set up Git repository
-                uses: actions/checkout@v2
-            -   name: Compile LaTeX document
-                uses: xu-cheng/latex-action@v2
-                with:
-                    # options listed here:
-                    # https://github.com/xu-cheng/latex-action
-                    root_file: diplom.tex
-                    latexmk_use_lualatex: true
-                    # required when using the "minted" package for beautiful styled code
-                    # latexmk_shell_escape: true
+  # Builds with a regular toolchain via latexmk.
+  regular_build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Git repository
+        uses: actions/checkout@v4
+      - name: Compile LaTeX document
+        uses: xu-cheng/latex-action@v2
+        with:
+          # options listed here:
+          # https://github.com/xu-cheng/latex-action
+          root_file: diplom.tex
+          latexmk_use_lualatex: true
+          # required when using the "minted" package for beautiful styled code
+          # latexmk_shell_escape: true
 
-    # checkbiw and check-french-spacing must execute without error
-    check_scripts:
-        runs-on: ubuntu-latest
-        steps:
-            -   name: Set up Git repository
-                uses: actions/checkout@v2
-                # additionally: check out submodules
-                with:
-                    submodules: recursive
-            -   name: install make
-                run: sudo apt update && sudo apt install make
-            -   name: make check-french-spacing
-                run: make check-french-spacing
-            -   name: install diction
-                run: sudo apt update && sudo apt install diction
-            -   name: make checkbiw
-                run: make checkbiw
+  # checkbiw and check-french-spacing must execute without error
+  check_scripts:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Git repository
+        uses: actions/checkout@v4
+        # additionally: check out submodules
+        with:
+          submodules: recursive
+      - name: install make
+        run: sudo apt update && sudo apt install make
+      - name: make check-french-spacing
+        run: make check-french-spacing
+      - name: install diction
+        run: sudo apt update && sudo apt install diction
+      - name: make checkbiw
+        run: make checkbiw