From ad3f224c9fdf262081c60aca091a30e644ceec0b Mon Sep 17 00:00:00 2001 From: Javier R Date: Sat, 30 Nov 2024 17:33:48 +0100 Subject: [PATCH 1/9] chore: update `submodules` project location --- .gitmodules | 4 ++-- {actions => external}/haskell-setup | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename {actions => external}/haskell-setup (100%) diff --git a/.gitmodules b/.gitmodules index 48512ab..a4dc4d2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "actions/haskell-setup"] - path = actions/haskell-setup +[submodule "external/haskell-setup"] + path = external/haskell-setup url = git@github.com:haskell-actions/setup.git diff --git a/actions/haskell-setup b/external/haskell-setup similarity index 100% rename from actions/haskell-setup rename to external/haskell-setup From 4ca779afcc4d2c5d3339a7e552f1d7353b3650f9 Mon Sep 17 00:00:00 2001 From: Javier R Date: Sat, 30 Nov 2024 17:35:17 +0100 Subject: [PATCH 2/9] fix: downgrade `ghc` to `9.8.2` and `cabal` to `3.10.3.0` for compatibility issues --- .devcontainer/devcontainer.json | 24 ++++++++++++------------ .github/workflows/coverage.yaml | 6 +++--- glados.cabal | 6 +++--- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b4775a3..478f69d 100644 --- a/.devcontainer/devcontainer.json +++ b/.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.8.2", + "cabalVersion": "3.10.3.0", + "globalPackages": "hspec-discover hpc-codecov hlint ormolu" + }, + "ghcr.io/devcontainers-contrib/features/pipx-package:1": { + "package": "pre-commit" + } + } } diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index 53f64c0..061d261 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -34,10 +34,10 @@ 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.8.2 + cabal-version: 3.10.3.0 - name: Install dependencies if: ${{ steps.cabal-cache.outputs.cache-hit != 'true' }} diff --git a/glados.cabal b/glados.cabal index c28017b..23f54c3 100644 --- a/glados.cabal +++ b/glados.cabal @@ -18,7 +18,7 @@ common warnings library import: warnings exposed-modules: Misc - build-depends: base ^>=4.20.0.0 + build-depends: base ^>=4.19.0.0 hs-source-dirs: lib default-language: Haskell2010 @@ -26,7 +26,7 @@ executable glados import: warnings main-is: Main.hs build-depends: - base ^>=4.20.0.0, + base ^>=4.19.0.0, glados, hs-source-dirs: app @@ -41,7 +41,7 @@ test-suite glados-test main-is: Spec.hs build-depends: QuickCheck, - base ^>=4.20.0.0, + base ^>=4.19.0.0, glados, hspec, hspec-discover, From 2175b625df1d9c1ec3b29f77d3d70809b4bd8bee Mon Sep 17 00:00:00 2001 From: Javier R Date: Sat, 30 Nov 2024 18:18:10 +0100 Subject: [PATCH 3/9] add: `llvm-hs-pretty` submodule --- .gitmodules | 3 +++ external/llvm-hs-pretty | 1 + 2 files changed, 4 insertions(+) create mode 160000 external/llvm-hs-pretty diff --git a/.gitmodules b/.gitmodules index a4dc4d2..f1b1c7a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [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 diff --git a/external/llvm-hs-pretty b/external/llvm-hs-pretty new file mode 160000 index 0000000..79aba3c --- /dev/null +++ b/external/llvm-hs-pretty @@ -0,0 +1 @@ +Subproject commit 79aba3c5221507f9000af99c3d8d809036b452dc From 82eedec6d1848a2c96ff60f54fdd957069f52ec4 Mon Sep 17 00:00:00 2001 From: Javier R Date: Sat, 30 Nov 2024 18:18:21 +0100 Subject: [PATCH 4/9] add: `test` files to gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 0f8de77..fdae426 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,5 @@ cabal.project.local~ .HTF/ .ghc.environment.* venv/ +*.tix +codecov.json From 43a864f35f15fb91efda0fd78350b1d2592a5920 Mon Sep 17 00:00:00 2001 From: Javier R Date: Sat, 30 Nov 2024 18:19:52 +0100 Subject: [PATCH 5/9] add: external `llvm-hs-pretty` dependency --- cabal.project | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 cabal.project diff --git a/cabal.project b/cabal.project new file mode 100644 index 0000000..6707713 --- /dev/null +++ b/cabal.project @@ -0,0 +1,2 @@ +packages: . + external/llvm-hs-pretty From a7a0236e2087eedaeb6970292a965546d0540530 Mon Sep 17 00:00:00 2001 From: Javier R Date: Sat, 30 Nov 2024 18:20:09 +0100 Subject: [PATCH 6/9] chore: downgrade `versions` and add `dependencies` --- glados.cabal | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/glados.cabal b/glados.cabal index 23f54c3..df4f3aa 100644 --- a/glados.cabal +++ b/glados.cabal @@ -18,7 +18,7 @@ common warnings library import: warnings exposed-modules: Misc - build-depends: base ^>=4.19.0.0 + build-depends: base ^>=4.17.2.1 hs-source-dirs: lib default-language: Haskell2010 @@ -26,8 +26,10 @@ executable glados import: warnings main-is: Main.hs build-depends: - base ^>=4.19.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.19.0.0, + base ^>=4.17.2.1, glados, hspec, hspec-discover, From a641cb02a724181923a985c6b841e8b3cbcf890d Mon Sep 17 00:00:00 2001 From: Javier R Date: Sat, 30 Nov 2024 18:20:19 +0100 Subject: [PATCH 7/9] chore: downgrade `ghc` version --- .devcontainer/devcontainer.json | 2 +- .github/workflows/coverage.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 478f69d..a69b7ec 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,7 +3,7 @@ "image": "mcr.microsoft.com/devcontainers/base:bullseye", "features": { "ghcr.io/devcontainers-extra/features/haskell:2": { - "ghcVersion": "9.8.2", + "ghcVersion": "9.4.8", "cabalVersion": "3.10.3.0", "globalPackages": "hspec-discover hpc-codecov hlint ormolu" }, diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index 061d261..c53ecdb 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -36,7 +36,7 @@ jobs: if: ${{ steps.cabal-cache.outputs.cache-hit != 'true' && steps.ghcup-cache.outputs.cache-hit != 'true' }} uses: ./external/haskell-setup with: - ghc-version: 9.8.2 + ghc-version: 9.4.8 cabal-version: 3.10.3.0 - name: Install dependencies From c73ce38fd67ffdd4169b2471ae4f92ce95db2a42 Mon Sep 17 00:00:00 2001 From: Javier R Date: Sat, 30 Nov 2024 18:38:16 +0100 Subject: [PATCH 8/9] chore: overwrite `dependencies` if present --- .github/workflows/coverage.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index c53ecdb..2f545f3 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -43,7 +43,7 @@ jobs: 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' }} From 029ce01359ec32e978a508518a9205dd183da58a Mon Sep 17 00:00:00 2001 From: Javier R Date: Sat, 30 Nov 2024 18:56:12 +0100 Subject: [PATCH 9/9] fix: disable `library` coverage --- .github/workflows/coverage.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index 2f545f3..654ddf0 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -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