From e718be207a043489f2535cdba23378202ee87d43 Mon Sep 17 00:00:00 2001
From: Brendan Golden <git@brendan.ie>
Date: Mon, 13 May 2024 21:39:53 +0100
Subject: [PATCH] ci: improved pipeline

---
 .gitlab-ci.yml | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5872617..4adc6c2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ stages:
   - attic login skynet https://nix-cache.skynet.ie/ $CACHE_KEY
   - attic use skynet-cache
 
-handovers:
+.build_base: &pdf_base
   tags:
     - nix
   before_script:
@@ -21,15 +21,15 @@ handovers:
   rules:
     - if: '$CI_PROJECT_NAMESPACE == "compsoc1/compsoc" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
       changes:
-      - Committee/_Handovers/**/*
+        - Committee/_Handovers/**/*
+        - Minutes/**/*
 
+handovers:
+  <<: *pdf_base
   # what it runs
   script:
-    # cache any dependencies
     - attic watch-store skynet-cache &
     - nix --extra-experimental-features 'nix-command flakes' run .#handovers
-
-  # what it does afterwards
   artifacts:
     name: "Handovers"
     paths:
@@ -37,26 +37,10 @@ handovers:
 
 
 minutes:
-  tags:
-    - nix
-  before_script:
-    - *scripts_base
-    - *scripts_cache
-  stage: build
-
-  # when it runs
-  rules:
-    - if: '$CI_PROJECT_NAMESPACE == "compsoc1/compsoc" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
-      changes:
-      - Minutes/**/*
-
-  # what it runs
+  <<: *pdf_base
   script:
-    # cache any dependencies
     - attic watch-store skynet-cache &
     - nix --extra-experimental-features 'nix-command flakes' run .#minutes
-
-  # what it does afterwards
   artifacts:
     name: "Minutes"
     paths: