build: test with other compiler versions

DavSanchez · May 20, 2024 · 01b8e69 · 01b8e69
1 parent ccd701a
commit 01b8e69
Show file tree

Hide file tree

Showing 5 changed files with 125 additions and 57 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -7,6 +7,7 @@ on:
     branches: [master]
 jobs:
   checks:
+    name: "Run Nix checks"
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -25,5 +26,97 @@ jobs:
       - name: Run Nix checks
         run: nix flake check
 
-      - name: Build with Nix (runs tests)
+  default-ghc:
+    name: "Build & test with Nix (default unstable GHC)"
+    needs: [checks]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Nix
+        uses: cachix/install-nix-action@v27
+
+      - name: Enable cache for Nix
+        uses: DeterminateSystems/magic-nix-cache-action@v2
+
+      - name: Build default package with Nix
         run: nix build
+
+  ghc-94:
+    name: "Build & test with Nix (GHC 9.4)"
+    needs: [checks]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Nix
+        uses: cachix/install-nix-action@v27
+
+      - name: Enable cache for Nix
+        uses: DeterminateSystems/magic-nix-cache-action@v2
+
+      - name: Build package with Nix (GHC 9.4)
+        run: nix build ".#richenv-ghc94"
+
+  ghc-96:
+    name: "Build & test with Nix (GHC 9.6)"
+    needs: [checks]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Nix
+        uses: cachix/install-nix-action@v27
+
+      - name: Enable cache for Nix
+        uses: DeterminateSystems/magic-nix-cache-action@v2
+
+      - name: Build package with Nix (GHC 9.6)
+        run: nix build ".#richenv-ghc96"
+
+  ghc-98:
+    name: "Build & test with Nix (GHC 9.8)"
+    needs: [checks]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Nix
+        uses: cachix/install-nix-action@v27
+
+      - name: Enable cache for Nix
+        uses: DeterminateSystems/magic-nix-cache-action@v2
+
+      - name: Build package with Nix (GHC 9.8)
+        run: nix build ".#richenv-ghc98"
+
+  # ghc-910:
+  #   name: "Build & test with Nix (GHC 9.10)"
+  #   needs: [checks]
+  #   runs-on: ${{ matrix.os }}
+  #   strategy:
+  #     matrix:
+  #       os: [ubuntu-latest, macos-latest]
+  #   steps:
+  #     - uses: actions/checkout@v4
+
+  #     - name: Install Nix
+  #       uses: cachix/install-nix-action@v27
+
+  #     - name: Enable cache for Nix
+  #       uses: DeterminateSystems/magic-nix-cache-action@v2
+
+  #     - name: Build package with Nix (GHC 9.10)
+  #       run: nix build ".#richenv-ghc910"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Revision history for richenv
 
+## 0.1.0.2 -- 2024-05-20
+
+* test: switch dependency for YAML parsing from `yaml` to `HsYAML`.
+
 ## 0.1.0.1 -- 2023-09-25
 
 * Fix changelog.

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -10,8 +10,9 @@
 
   outputs = inputs @ {flake-parts, ...}:
     flake-parts.lib.mkFlake {inherit inputs;} {
-      imports = [
-        inputs.git-hooks.flakeModule
+      imports = with inputs; [
+        git-hooks.flakeModule
+        # haskell-flake.flakeModule
       ];
 
       systems = [
@@ -25,9 +26,7 @@
         config,
         pkgs,
         ...
-      }: let
-        haskell = pkgs.haskellPackages;
-      in {
+      }: {
         pre-commit = {
           check.enable = true;
           settings = {
@@ -43,8 +42,6 @@
               ormolu.enable = true;
               hlint.enable = true;
               hpack.enable = true;
-              # yamllint.enable = true;
-              # hunspell.enable = true;
             };
           };
         };
@@ -56,15 +53,22 @@
           '';
           nativeBuildInputs = config.pre-commit.settings.enabledPackages;
 
-          buildInputs = with haskell; [
+          buildInputs = with pkgs.haskellPackages; [
             ghc
             cabal-install
             haskell-language-server
             hspec-discover
           ];
         };
 
-        packages.default = haskell.callPackage ./default.nix {};
+        packages = {
+          default = pkgs.haskellPackages.callPackage ./default.nix {};
+
+          richenv-ghc94 = pkgs.haskell.packages.ghc94.callPackage ./default.nix {};
+          richenv-ghc96 = pkgs.haskell.packages.ghc96.callPackage ./default.nix {};
+          richenv-ghc98 = pkgs.haskell.packages.ghc98.callPackage ./default.nix {};
+          # richenv-ghc910 = pkgs.haskell.packages.ghc910.callPackage ./default.nix {};
+        };
       };
     };
 }
diff --git a/richenv.cabal b/richenv.cabal
@@ -58,7 +58,7 @@ extra-doc-files:
 -- Extra source files to be distributed with the package, such as examples, or a tutorial module.
 -- extra-source-files:
 
-tested-with:     GHC ==9.2.8 || ==9.4.6 || ==9.6.2
+tested-with:     GHC ==9.4.8 || ==9.6.5 || ==9.8.2 || ==9.10.1
 
 source-repository head
   type:     git