From e8650ed30102208bc30e1cd83ab2daab4a71c604 Mon Sep 17 00:00:00 2001
From: Sean D Gillespie <sean.gillespie@iohk.io>
Date: Mon, 29 Apr 2024 16:39:17 -0400
Subject: [PATCH] fix(ci): Fix a handful of GH actions errors

 * devx: command not found
 * jq: error (at <stdin>:0): Cannot index array with string "style"
---
 .github/workflows/haskell.yml | 36 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
index 1b13e11c027..355f6c00044 100644
--- a/.github/workflows/haskell.yml
+++ b/.github/workflows/haskell.yml
@@ -41,26 +41,12 @@ jobs:
         a+${{ github.event_name }}
         b+${{ github.workflow_ref }}
         c+${{ github.job }}
-        d+${{ matrix.ghc }}
-        e+${{ matrix.cabal }}
-        f+${{ matrix.os }}
-        g+${{ (startsWith(github.ref, 'refs/heads/gh-readonly-queue/') && github.run_id) || github.event.pull_request.number || github.ref }}
+        d+${{ matrix.compiler-nix-name }}
+        e+${{ matrix.platform }}
+        f+${{ (startsWith(github.ref, 'refs/heads/gh-readonly-queue/') && github.run_id) || github.event.pull_request.number || github.ref }}
       cancel-in-progress: true
 
     steps:
-    - name: Concurrency group
-      run: >
-        echo
-        a+${{ github.event_name }}
-        b+${{ github.workflow_ref }}
-        c+${{ github.job }}
-        d+${{ matrix.ghc }}
-        e+${{ matrix.cabal }}
-        f+${{ matrix.os }}
-        g+${{ (startsWith(github.ref, 'refs/heads/gh-readonly-queue/') && github.run_id) || github.event.pull_request.number || github.ref }}
-
-    - uses: actions/checkout@v4
-
     - name: Install GHC and Cabal
       uses: input-output-hk/actions/devx@latest
       with:
@@ -70,7 +56,19 @@ jobs:
         # for now we'll set minimal to false, as minimal-iog images don't exist.
         minimal: false
         iog: true
-        
+
+    - name: Concurrency group
+      run: >
+        echo
+        a+${{ github.event_name }}
+        b+${{ github.workflow_ref }}
+        c+${{ github.job }}
+        d+${{ matrix.compiler-nix-name }}
+        e+${{ matrix.platform }}
+        f+${{ (startsWith(github.ref, 'refs/heads/gh-readonly-queue/') && github.run_id) || github.event.pull_request.number || github.ref }}
+
+    - uses: actions/checkout@v4
+
     - name: Cabal update
       run: cabal update
 
@@ -92,7 +90,7 @@ jobs:
         # The tests call out to msys2 commands. We generally do not want to mix toolchains, so
         # we are very deliberate about only adding msys64 to the path where absolutely necessary.
         ${{ (runner.os == 'Windows' && '$env:PATH=("C:\msys64\mingw64\bin;{0}" -f $env:PATH)') || '' }}
-        cat dist-newstyle/cache/plan.json | jq -r '."install-plan" | select(.style != "local") | .id' | sort | uniq > dependencies.txt
+        cat dist-newstyle/cache/plan.json | jq -r '."install-plan" | .[] | select(.style != "local") | .id' | sort | uniq > dependencies.txt
 
     # From the dependency list we restore the cached dependencies.
     # We use the hash of `dependencies.txt` as part of the cache key because that will be stable