Fix build error in plutus-metatheory related to Cabal-syntax (#6803)

IntersectMBO · Jan 28, 2025 · 3af417f · 3af417f
1 parent af1b94c
commit 3af417f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/.github/workflows/cabal-build-all.yml b/.github/workflows/cabal-build-all.yml
@@ -8,9 +8,7 @@ name: "👷 Cabal Build All"
 
 on:
   workflow_dispatch:
-  push: 
-    branches:
-      - master
+  pull_request: 
 
 jobs:
   build:

diff --git a/.stylish-haskell.yaml b/.stylish-haskell.yaml
@@ -30,3 +30,4 @@ language_extensions:
   - QuasiQuotes
   - ScopedTypeVariables
   - TemplateHaskell
+  - CPP
diff --git a/plutus-metatheory/Setup.hs b/plutus-metatheory/Setup.hs
@@ -10,7 +10,9 @@ import Distribution.Types.BuildInfo qualified as D
 import Distribution.Types.ComponentLocalBuildInfo qualified as D
 import Distribution.Types.LocalBuildInfo qualified as D
 import Distribution.Verbosity qualified as D
-
+#if MIN_VERSION_Cabal(3,14,1)
+import Distribution.Utils.Path qualified as D
+#endif
 import Data.IORef (IORef, newIORef, readIORef, writeIORef)
 import System.IO.Unsafe (unsafePerformIO)
 
@@ -111,11 +113,19 @@ agdaPreProcessor _ lbi _ = D.PreProcessor
     runAgda :: D.Verbosity -> IO ()
     runAgda verb =
       D.runProgram verb agdaProgram
-        [ "--compile-dir", D.buildDir lbi
+        [ "--compile-dir", compileDir
         , "--compile"
         , "--ghc-dont-call-ghc"
         , "src/Main.lagda.md"
         ]
 
+#if MIN_VERSION_Cabal(3,14,1)
+    compileDir :: FilePath
+    compileDir = D.getSymbolicPath (D.buildDir lbi)
+#else
+    compileDir :: FilePath
+    compileDir = D.buildDir lbi
+#endif
+
     agdaProgram :: D.ConfiguredProgram
     agdaProgram = D.simpleConfiguredProgram "agda" (D.FoundOnSystem "agda")
diff --git a/plutus-tx-plugin/test/Budget/WithoutGHCOptimisations.hs b/plutus-tx-plugin/test/Budget/WithoutGHCOptimisations.hs
@@ -1,8 +1,7 @@
-{-# OPTIONS_GHC
- -O0 -fmax-simplifier-iterations=0
- -fno-omit-interface-pragmas
- -fno-ignore-interface-pragmas
-#-}
+{-# OPTIONS_GHC -O0 -fmax-simplifier-iterations=0 #-}
+{-# OPTIONS_GHC -fno-omit-interface-pragmas #-}
+{-# OPTIONS_GHC -fno-ignore-interface-pragmas #-}
+
 module Budget.WithoutGHCOptimisations where
 
 import PlutusTx.Prelude qualified as PlutusTx
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,9 +8,7 @@ name: "👷 Cabal Build All" @@
     on:
       workflow_dispatch:
-      push:
-        branches:
-          - master
+      pull_request:
     jobs:
       build:
@@ Expand Down @@