From ef23dd649d510a47f1aa24bf594d3bc9cfb34d4d Mon Sep 17 00:00:00 2001
From: Jack Hodgkinson <30505104+jhodgdev@users.noreply.github.com>
Date: Mon, 14 Feb 2022 16:14:24 +0000
Subject: [PATCH] restructured workflows

---
 .github/workflows/integrate.yaml  | 28 ++++++++++++++++++++--------
 .github/workflows/prepare-nix.yml | 23 -----------------------
 2 files changed, 20 insertions(+), 31 deletions(-)
 delete mode 100644 .github/workflows/prepare-nix.yml

diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
index 6198ba2..b067747 100644
--- a/.github/workflows/integrate.yaml
+++ b/.github/workflows/integrate.yaml
@@ -15,9 +15,25 @@ on:
       - "flake.lock"
       - "agora.cabal"
 jobs:
-  check-formatting:
+  setup:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2.4.0
+      - uses: cachix/install-nix-action@v16
+        name: Set up Nix and IOHK caches
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+          extra_nix_config: |
+            trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= iohk.cachix.org-1:DpRUyj7h7V830dp/i6Nti+NEO2/nhblbov/8MW7Rqoo= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
+            substituters = https://hydra.iohk.io https://iohk.cachix.org https://cache.nixos.org/
+            experimental-features = nix-command flakes
+      - uses: cachix/cachix-action@v10
+        with:
+          name: mlabs
+          authToken: ${{ secrets.CACHIX_KEY }}
+  check-formatting:
+    needs: setup
     runs-on: ubuntu-latest
-    uses: ./.github/workflows/prepare-nix.yml
     secrets:
       CACHIX_KEY: ${{ secrets.CACHIX_KEY }}
     steps:
@@ -25,19 +41,15 @@ jobs:
         name: Run fourmolu
 
   run-linter:
+    needs: setup
     runs-on: ubuntu-latest
-    uses: ./.github/workflows/prepare-nix.yml
-    secrets:
-      CACHIX_KEY: ${{ secrets.CACHIX_KEY }}
     steps:
       - run: nix run nixpkgs#hlint -- $(git ls-tree -r HEAD --full-tree --name-only | grep -E '.*\.hs')
         name: Run hlint
 
   check-build:
+    needs: setup
     runs-on: ubuntu-latest
-    uses: ./.github/workflows/prepare-nix.yml
-    secrets:
-      CACHIX_KEY: ${{ secrets.CACHIX_KEY }}
     steps:
       - name: Add cabal folder to cache
         id: cabal
diff --git a/.github/workflows/prepare-nix.yml b/.github/workflows/prepare-nix.yml
deleted file mode 100644
index 8921f28..0000000
--- a/.github/workflows/prepare-nix.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-on:
-  workflow_call:
-    secrets:
-      CACHIX_KEY:
-        required: true
-
-jobs:
-  prepare_nix:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2.4.0
-      - uses: cachix/install-nix-action@v16
-        name: Set up Nix and IOHK caches
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-          extra_nix_config: |
-            trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= iohk.cachix.org-1:DpRUyj7h7V830dp/i6Nti+NEO2/nhblbov/8MW7Rqoo= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
-            substituters = https://hydra.iohk.io https://iohk.cachix.org https://cache.nixos.org/
-            experimental-features = nix-command flakes
-      - uses: cachix/cachix-action@v10
-        with:
-          name: mlabs
-          authToken: ${{ secrets.CACHIX_KEY }}