From 4e9b5c7aa772968584c6f0ef26b82ca323c69ba8 Mon Sep 17 00:00:00 2001 From: wucke13 Date: Mon, 14 Oct 2024 09:14:42 +1100 Subject: [PATCH] chore: update documents.toml Also: - regenerate CI job list - fix CI generator script - make prettier ignore the flake.lock --- .ci/gen-workflow-files.nu | 4 +- .github/workflows/nix.yaml | 120 +++++++++++++++++++++++++++++++++++ .prettierignore | 1 + 2024-08-29-hackmas/latexmkrc | 6 +- 2024-09-20-eacn/latexmkrc | 6 +- documents.toml | 15 +++++ flake.nix | 1 + 7 files changed, 145 insertions(+), 8 deletions(-) diff --git a/.ci/gen-workflow-files.nu b/.ci/gen-workflow-files.nu index bc59d7d..c4a1b61 100755 --- a/.ci/gen-workflow-files.nu +++ b/.ci/gen-workflow-files.nu @@ -1,6 +1,6 @@ #!/usr/bin/env nu -use log * +use std log # cd to git root cd (git rev-parse --show-toplevel) @@ -137,4 +137,4 @@ log info "saving nix-cachix workflow" $cachix_workflow | to yaml | save --force .github/workflows/nix.yaml log info "prettify generated yaml" -prettier -w .github/workflows/ \ No newline at end of file +prettier -w .github/workflows/ diff --git a/.github/workflows/nix.yaml b/.github/workflows/nix.yaml index a216525..a9392ad 100644 --- a/.github/workflows/nix.yaml +++ b/.github/workflows/nix.yaml @@ -55,6 +55,126 @@ jobs: publish_dir: result/ publish_branch: pdf/2023-07-04-IAV force_orphan: true + x86_64-linux---2023-07-10-FormosaRetreat: + name: Build x86_64-linux.2023-07-10-FormosaRetreat + runs-on: + - ubuntu-latest + needs: [] + steps: + - uses: actions/checkout@v3 + - uses: cachix/install-nix-action@v22 + with: + nix_path: nixpkgs=channel:nixos-unstable + - uses: cachix/cachix-action@v12 + with: + name: rosenpass-slides + authToken: ${{ secrets.CACHIX_AUTH_TOKEN }} + - name: Build + run: nix build .#packages.x86_64-linux.2023-07-10-FormosaRetreat --print-build-logs + - name: Deploy PDF artifacts + uses: peaceiris/actions-gh-pages@v3 + if: github.ref == 'refs/heads/main' + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: result/ + publish_branch: pdf/2023-07-10-FormosaRetreat + force_orphan: true + x86_64-linux---2023-09-03-MRMCD2023: + name: Build x86_64-linux.2023-09-03-MRMCD2023 + runs-on: + - ubuntu-latest + needs: [] + steps: + - uses: actions/checkout@v3 + - uses: cachix/install-nix-action@v22 + with: + nix_path: nixpkgs=channel:nixos-unstable + - uses: cachix/cachix-action@v12 + with: + name: rosenpass-slides + authToken: ${{ secrets.CACHIX_AUTH_TOKEN }} + - name: Build + run: nix build .#packages.x86_64-linux.2023-09-03-MRMCD2023 --print-build-logs + - name: Deploy PDF artifacts + uses: peaceiris/actions-gh-pages@v3 + if: github.ref == 'refs/heads/main' + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: result/ + publish_branch: pdf/2023-09-03-MRMCD2023 + force_orphan: true + x86_64-linux---2024-03-01-ptfDemoDay: + name: Build x86_64-linux.2024-03-01-ptfDemoDay + runs-on: + - ubuntu-latest + needs: [] + steps: + - uses: actions/checkout@v3 + - uses: cachix/install-nix-action@v22 + with: + nix_path: nixpkgs=channel:nixos-unstable + - uses: cachix/cachix-action@v12 + with: + name: rosenpass-slides + authToken: ${{ secrets.CACHIX_AUTH_TOKEN }} + - name: Build + run: nix build .#packages.x86_64-linux.2024-03-01-ptfDemoDay --print-build-logs + - name: Deploy PDF artifacts + uses: peaceiris/actions-gh-pages@v3 + if: github.ref == 'refs/heads/main' + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: result/ + publish_branch: pdf/2024-03-01-ptfDemoDay + force_orphan: true + x86_64-linux---2024-08-29-hackmas: + name: Build x86_64-linux.2024-08-29-hackmas + runs-on: + - ubuntu-latest + needs: [] + steps: + - uses: actions/checkout@v3 + - uses: cachix/install-nix-action@v22 + with: + nix_path: nixpkgs=channel:nixos-unstable + - uses: cachix/cachix-action@v12 + with: + name: rosenpass-slides + authToken: ${{ secrets.CACHIX_AUTH_TOKEN }} + - name: Build + run: nix build .#packages.x86_64-linux.2024-08-29-hackmas --print-build-logs + - name: Deploy PDF artifacts + uses: peaceiris/actions-gh-pages@v3 + if: github.ref == 'refs/heads/main' + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: result/ + publish_branch: pdf/2024-08-29-hackmas + force_orphan: true + x86_64-linux---2024-09-20-eacn: + name: Build x86_64-linux.2024-09-20-eacn + runs-on: + - ubuntu-latest + needs: [] + steps: + - uses: actions/checkout@v3 + - uses: cachix/install-nix-action@v22 + with: + nix_path: nixpkgs=channel:nixos-unstable + - uses: cachix/cachix-action@v12 + with: + name: rosenpass-slides + authToken: ${{ secrets.CACHIX_AUTH_TOKEN }} + - name: Build + run: nix build .#packages.x86_64-linux.2024-09-20-eacn --print-build-logs + - name: Deploy PDF artifacts + uses: peaceiris/actions-gh-pages@v3 + if: github.ref == 'refs/heads/main' + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: result/ + publish_branch: pdf/2024-09-20-eacn + force_orphan: true x86_64-linux---check: name: Run Nix checks on x86_64-linux runs-on: diff --git a/.prettierignore b/.prettierignore index 9b42106..77e64b1 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1 +1,2 @@ .direnv/ +flake.lock diff --git a/2024-08-29-hackmas/latexmkrc b/2024-08-29-hackmas/latexmkrc index 0620434..f73078a 100644 --- a/2024-08-29-hackmas/latexmkrc +++ b/2024-08-29-hackmas/latexmkrc @@ -1,8 +1,8 @@ $pdf_mode=4; $lualatex = 'lualatex -shell-escape'; -# ensure_path('TEXINPUTS','../tex/'); -# ensure_path('LUAINPUTS','../tex/'); -# ensure_path('OSFONTDIR', '../tex/'); +ensure_path('TEXINPUTS','../tex/'); +ensure_path('LUAINPUTS','../tex/'); +ensure_path('OSFONTDIR', '../tex/'); @default_files=("*slides*.tex"); diff --git a/2024-09-20-eacn/latexmkrc b/2024-09-20-eacn/latexmkrc index 0620434..f73078a 100644 --- a/2024-09-20-eacn/latexmkrc +++ b/2024-09-20-eacn/latexmkrc @@ -1,8 +1,8 @@ $pdf_mode=4; $lualatex = 'lualatex -shell-escape'; -# ensure_path('TEXINPUTS','../tex/'); -# ensure_path('LUAINPUTS','../tex/'); -# ensure_path('OSFONTDIR', '../tex/'); +ensure_path('TEXINPUTS','../tex/'); +ensure_path('LUAINPUTS','../tex/'); +ensure_path('OSFONTDIR', '../tex/'); @default_files=("*slides*.tex"); diff --git a/documents.toml b/documents.toml index da3e2bc..74ccc81 100644 --- a/documents.toml +++ b/documents.toml @@ -4,3 +4,18 @@ video = "https://media.ccc.de/v/eh20-4-rosenpass-ein-vpn-zum-schutz-vor-quantenc [[documents]] name = "2023-07-04-IAV" + +[[documents]] +name = "2023-07-10-FormosaRetreat" + +[[documents]] +name = "2023-09-03-MRMCD2023" + +[[documents]] +name = "2024-03-01-ptfDemoDay" + +[[documents]] +name = "2024-08-29-hackmas" + +[[documents]] +name = "2024-09-20-eacn" diff --git a/flake.nix b/flake.nix index 3f0259a..09c4e79 100644 --- a/flake.nix +++ b/flake.nix @@ -40,6 +40,7 @@ sourceRoot = "./${name}"; nativeBuildInputs = with pkgs; [ google-fonts + python3Packages.pygments tex ]; buildPhase = ''