Merge pull request #2 from EpitechPromo2027/jabolol/cleanup-structure

chore: general `cleanup` and organization fixes

.devcontainer/devcontainer.json

@@ -1,14 +1,14 @@
 {
-	"name": "Glados Debian",
-	"image": "mcr.microsoft.com/devcontainers/base:bullseye",
-	"features": {
-		"ghcr.io/devcontainers-extra/features/haskell:2": {
-			"ghcVersion": "9.10.1",
-			"cabalVersion": "3.12.1.0",
-			"globalPackages": "hspec-discover hpc-codecov hlint ormolu"
-		},
-		"ghcr.io/devcontainers-contrib/features/pipx-package:1": {
-			"package": "pre-commit"
-		}
-	}
+  "name": "Glados Debian",
+  "image": "mcr.microsoft.com/devcontainers/base:bullseye",
+  "features": {
+    "ghcr.io/devcontainers-extra/features/haskell:2": {
+      "ghcVersion": "9.4.8",
+      "cabalVersion": "3.10.3.0",
+      "globalPackages": "hspec-discover hpc-codecov hlint ormolu"
+    },
+    "ghcr.io/devcontainers-contrib/features/pipx-package:1": {
+      "package": "pre-commit"
+    }
+  }
 }

.github/workflows/coverage.yaml

@@ -34,16 +34,16 @@ jobs:
 
       - name: Setup Haskell
         if: ${{ steps.cabal-cache.outputs.cache-hit != 'true' && steps.ghcup-cache.outputs.cache-hit != 'true' }}
-        uses: ./actions/haskell-setup
+        uses: ./external/haskell-setup
         with:
-          ghc-version: 9.10.1
-          cabal-version: 3.12.1.0
+          ghc-version: 9.4.8
+          cabal-version: 3.10.3.0
 
       - name: Install dependencies
         if: ${{ steps.cabal-cache.outputs.cache-hit != 'true' }}
         run: |
           cabal update
-          cabal install hspec-discover hpc-codecov
+          cabal install hspec-discover hpc-codecov --overwrite-policy=always
 
       - name: Setup environment
         if: ${{ steps.cabal-cache.outputs.cache-hit == 'true' && steps.ghcup-cache.outputs.cache-hit == 'true' }}
@@ -53,7 +53,7 @@ jobs:
 
       - name: Build and test
         run: |
-          cabal configure --enable-coverage
+          cabal configure --enable-coverage --disable-library-coverage
           cabal build --jobs=1
           cabal test --jobs=1
 

.gitignore

@@ -22,3 +22,5 @@ cabal.project.local~
 .HTF/
 .ghc.environment.*
 venv/
+*.tix
+codecov.json

.gitmodules

@@ -1,3 +1,6 @@
-[submodule "actions/haskell-setup"]
-	path = actions/haskell-setup
+[submodule "external/haskell-setup"]
+	path = external/haskell-setup
 	url = git@github.com:haskell-actions/setup.git
+[submodule "external/llvm-hs-pretty"]
+	path = external/llvm-hs-pretty
+	url = git@github.com:Jabolol/llvm-hs-pretty.git

cabal.project

@@ -0,0 +1,2 @@
+packages: .
+    external/llvm-hs-pretty

glados.cabal

@@ -18,16 +18,18 @@ common warnings
 library
   import: warnings
   exposed-modules: Misc
-  build-depends: base ^>=4.20.0.0
+  build-depends: base ^>=4.17.2.1
   hs-source-dirs: lib
   default-language: Haskell2010
 
 executable glados
   import: warnings
   main-is: Main.hs
   build-depends:
-    base ^>=4.20.0.0,
+    base ^>=4.17.2.1,
     glados,
+    llvm-hs-pretty >=0.9.0 && <0.10,
+    llvm-hs-pure >=9.0.0 && <9.1,
 
   hs-source-dirs: app
   default-language: Haskell2010
@@ -41,7 +43,7 @@ test-suite glados-test
   main-is: Spec.hs
   build-depends:
     QuickCheck,
-    base ^>=4.20.0.0,
+    base ^>=4.17.2.1,
     glados,
     hspec,
     hspec-discover,