From 4e372cf48586013c13f1c6938948ad0e2b1e89e8 Mon Sep 17 00:00:00 2001
From: Brendan Golden <git@brendan.ie>
Date: Mon, 20 May 2024 03:05:24 +0100
Subject: [PATCH] ci: simplify pipeline

---
 .gitlab-ci.yml                                | 67 ++++---------------
 .../2023-2024/Budget/10._Guest_Speakers.md    |  1 -
 2 files changed, 13 insertions(+), 55 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6993cc3..7cd585f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,75 +1,34 @@
 stages:
   - build
 
-.scripts_base: &scripts_base
-  - nix --extra-experimental-features 'nix-command flakes' profile install nixpkgs#bash
-
-.scripts_cache: &scripts_cache
-  - nix --extra-experimental-features 'nix-command flakes' profile install nixpkgs#attic-client
-  - attic login skynet https://nix-cache.skynet.ie/ $CACHE_KEY
-  - attic use skynet-cache
-
-.build_base: &pdf_base
+pdf:
   tags:
     - nix
   before_script:
-    - *scripts_base
-    - *scripts_cache
+    # basic stuff
+    - nix --extra-experimental-features 'nix-command flakes' profile install nixpkgs#bash
+
+    # setup the cache stuff
+    - nix --extra-experimental-features 'nix-command flakes' profile install nixpkgs#attic-client
+    - attic login skynet https://nix-cache.skynet.ie/ $CACHE_KEY
+    - attic use skynet-cache
   stage: build
-
-  # when it runs
-#  rules:
-#    - if: '$CI_PROJECT_NAMESPACE == "compsoc1/compsoc" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
-#      changes:
-#        - Committee/**/Handovers/*
-#        - Committee/**/Budget/*
-#        - Minutes/**/*
-
-handovers:
-  <<: *pdf_base
   # what it runs
   script:
     - attic watch-store skynet-cache &
     - nix --extra-experimental-features 'nix-command flakes' run .#handovers
-  artifacts:
-    name: "Handovers"
-    expose_as: 'Handovers'
-    paths:
-      - Handovers_pdf/
-      - errors.log
-  rules:
-    - if: '$CI_PROJECT_NAMESPACE == "compsoc1/compsoc" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
-      changes:
-        - Committee/**/Handovers/*
-
-minutes:
-  <<: *pdf_base
-  script:
-    - attic watch-store skynet-cache &
     - nix --extra-experimental-features 'nix-command flakes' run .#minutes
-  artifacts:
-    name: "Minutes"
-    expose_as: 'Minutes'
-    paths:
-      - Minutes_pdf/
-      - errors.log
-  rules:
-    - if: '$CI_PROJECT_NAMESPACE == "compsoc1/compsoc" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
-      changes:
-        - Minutes/**/*
-
-budget:
-  <<: *pdf_base
-  script:
-    - attic watch-store skynet-cache &
     - nix --extra-experimental-features 'nix-command flakes' run .#budget
   artifacts:
-    name: "Budget"
-    expose_as: 'Budget'
+    name: "PDFs"
     paths:
+      - Handovers_pdf/
+      - Minutes_pdf/
       - Budget_pdf/
       - errors.log
   rules:
     - if: '$CI_PROJECT_NAMESPACE == "compsoc1/compsoc" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
       changes:
+        - Committee/**/Handovers/*
+        - Minutes/**/*
         - Committee/**/Budget/*
\ No newline at end of file
diff --git a/Committee/2023-2024/Budget/10._Guest_Speakers.md b/Committee/2023-2024/Budget/10._Guest_Speakers.md
index dc4a1ef..1704b48 100644
--- a/Committee/2023-2024/Budget/10._Guest_Speakers.md
+++ b/Committee/2023-2024/Budget/10._Guest_Speakers.md
@@ -1,3 +1,2 @@
 ## Guest speakers
 
-