Merge pull request mlabs-haskell#59 from mlabs-haskell/uhbif19/fix-ci

Fixup CI (2)
uhbif19 · Apr 29, 2024 · cb5deb8 · cb5deb8
2 parents 139d6b5 + 3d2f6ab
commit cb5deb8
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 426 deletions.
diff --git a/.envrc b/.envrc
@@ -3,4 +3,4 @@ if ! has nix_direnv_version || ! nix_direnv_version 2.3.0; then
   source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.3.0/direnvrc" "sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8="
 fi
 # https://github.com/input-output-hk/devx Slightly opinionated shared GitHub Action for Cardano-Haskell projects
-use flake "github:input-output-hk/devx#ghc963-iog"
+use flake "github:input-output-hk/devx#ghc964-iog"
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -1,16 +1,12 @@
 name: Haskell-CI
 on:
-  - push
+  - pull_request
+  - merge_group
 jobs:
   tests:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - name: Cache DevX
-      uses: actions/cache@v3
-      with:
-        path: /nix
-        key: "devx-ghc96"
     - name: Setup DevX
       uses: input-output-hk/actions/devx@latest
       with:
@@ -24,15 +20,11 @@ jobs:
         echo 'Running in DevX'
         ghc --version
         cabal --version
-    - name: Cache ~/.cabal/packages, ~/.cabal/store and dist-newstyle
-      uses: actions/cache@v3
+    - name: Save DevX cache
+      uses: actions/cache/save@v3
       with:
-        path: |
-          ~/.cabal/packages
-          ~/.cabal/store
-          dist-newstyle
-        key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('**/*.cabal', '**/cabal.project', '**/cabal.project.freeze') }}
-        restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-
+        path: /nix/store
+        key: "devx-ghc96"
     - name: Cabal build and test
       shell: devx {0}
       run: |
@@ -44,5 +36,21 @@ jobs:
       run: |
         cabal install cabal-fmt
         cabal install fourmolu
-        cabal-fmt --check cem-script.cabal
-        fourmolu .
+        /home/runner/.cabal-devx/bin/cabal-fmt --check cem-script.cabal
+        /home/runner/.cabal-devx/bin/fourmolu --mode check .
+    - name: Save cabal cache
+      uses: actions/cache/save@v3
+      if: always()
+      with:
+        path: |
+          ~/.cabal-devx
+          dist-newstyle
+        key: ${{ runner.os }}-ghc964-${{ hashFiles('**/*.cabal', '**/cabal.project', '**/cabal.project.freeze') }}
+    - name: Save cabal cache (generic key)
+      uses: actions/cache/save@v3
+      if: always()
+      with:
+        path: |
+          ~/.cabal-devx
+          dist-newstyle
+        key: ${{ runner.os }}-ghc964-
diff --git a/cem-script.cabal b/cem-script.cabal
@@ -19,12 +19,10 @@ common common-lang
   -- Options from MLabs styleguide
 
   ghc-options:
-
-  -- -Wall
-  -- -Wcompat -Wincomplete-record-updates
-  -- -Wincomplete-uni-patterns -Wredundant-constraints
-  -- -Wmissing-export-lists -Wmissing-deriving-strategies
-  -- -Wno-redundant-constraints
+    -Wall -Wcompat -Wincomplete-record-updates
+    -Wincomplete-uni-patterns -Wredundant-constraints
+    -Wmissing-export-lists -Wmissing-deriving-strategies
+    -Wno-redundant-constraints
 
   if !flag(dev)
     ghc-options: -Werror
@@ -112,7 +110,8 @@ common common-offchain
   build-depends:
     , aeson
     , bytestring
-    , cardano-api:{cardano-api, internal} == 8.38.0.0
+    , cardano-api                  ==8.38.0.0
+    , cardano-api:internal
     , cardano-crypto-class
     , cardano-ledger-alonzo
     , cardano-ledger-babbage
@@ -174,7 +173,8 @@ library
 
   other-modules:   Cardano.CEM.Monads.L1Commons
   build-depends:
-    , cem-script:{cardano-extras, data-spine}
+    , cem-script:cardano-extras
+    , cem-script:data-spine
     , clb
     , dependent-map
     , ouroboros-consensus
@@ -187,7 +187,9 @@ test-suite cem-sdk-test
 
   type:           exitcode-stdio-1.0
   build-depends:
-    , cem-script:{cem-script, cardano-extras, data-spine}
+    , cem-script
+    , cem-script:cardano-extras
+    , cem-script:data-spine
     , clb
     , dependent-map
     , hspec

diff --git a/src-lib/cardano-extras/Plutus/Deriving.hs b/src-lib/cardano-extras/Plutus/Deriving.hs
diff --git a/src/Cardano/CEM/Constraints.hs b/src/Cardano/CEM/Constraints.hs
diff --git a/src/Cardano/CEM/Documentation.hs b/src/Cardano/CEM/Documentation.hs
@@ -2,9 +2,9 @@ module Cardano.CEM.Documentation (cemDotGraphString) where
 
 import Prelude
 
+import Data.Foldable (fold)
 import Data.Map qualified as Map
 import Data.Proxy
-import Data.Foldable (fold)
 
 import Cardano.CEM
 
@@ -31,14 +31,14 @@ cemDotGraphString name proxy =
     edges =
       fold $
         [ maybe "\"Void In\"" showSpine from
-              <> " -> "
-              <> maybe "\"Void Out\"" showSpine to
-              <> " [label=\""
-              <> showSpine transition
-              <> " (stage "
-              <> show stage
-              <> ")"
-              <> "\"]; \n"
+          <> " -> "
+          <> maybe "\"Void Out\"" showSpine to
+          <> " [label=\""
+          <> showSpine transition
+          <> " (stage "
+          <> show stage
+          <> ")"
+          <> "\"]; \n"
         | (transition, (stage, from, to)) <-
             Map.assocs $ transitionStage proxy
         ]