Update .envrc and github workflows

Author: ch1bo

.envrc

@@ -1 +1 @@
-use nix
+use flake

.github/workflows/ci.yaml

@@ -42,65 +42,36 @@ jobs:
 
     - name: Prepare nix shell
       run:
-        nix develop --accept-flake-config --build
+        nix develop --build
+
+    - name: Formatting
+      run:
+        nix develop --command fourmolu --mode check .
 
     - name: Build
       run: |
-        nix develop --accept-flake-config --command cabal update
-        nix develop --accept-flake-config --command cabal build all --ghc-options=-Werror
+        nix develop --command cabal update
+        nix develop --command cabal build all --ghc-options=-Werror
 
     - name: Test
       run:
-        nix develop --accept-flake-config --command cabal test all
-
-    - name: Formatting
-      run:
-        nix develop --accept-flake-config --command fourmolu --mode check .
-
-  haddock:
-    name: "Haddock & benchmarks"
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/[email protected]
-      with:
-        repository: input-output-hk/quickcheck-dynamic
-
-    - name: Prepare nix
-      uses: cachix/install-nix-action@v22
-      with:
-        extra_nix_config: |
-          accept-flake-config = true
-
-    - name: Github cache ~/.cabal/packages, ~/.cabal/store and dist-newstyle
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/.cabal/packages
-          ~/.cabal/store
-          dist-newstyle
-        key: |
-          cabal-${{ runner.os }}-${{ hashFiles('cabal.project', 'default.nix', 'shell.nix') }}
+        nix develop --command cabal test all
 
     - name: Documentation (Haddock)
       run: |
-        nix develop --accept-flake-config --command .github/workflows/ci-haddock.sh
+        nix develop --command .github/workflows/ci-haddock.sh
 
-    - name: Upload build & test artifacts
+    - name: Upload Documentation
       uses: actions/upload-artifact@v4
       with:
         name: haddocks
         path: ./docs
 
   documentation:
     name: Documentation
-    needs: [haddock]
+    needs: [build-test]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/[email protected]
-      with:
-        repository: input-output-hk/quickcheck-dynamic
-
     - name: Download generated documentation
       uses: actions/download-artifact@v4
       with:

.github/workflows/publish.yaml

@@ -11,9 +11,11 @@ jobs:
       uses: dawidd6/action-download-artifact@v2
       with:
         workflow: release.yaml
-        name: quickcheck-dynamic.tar.gz
+        name: distribution
+
     - uses: haskell-actions/hackage-publish@v1
       with:
         hackageToken: ${{ secrets.HACKAGE }}
         packagesPath: '.'
+        docsPath: '.'
         publish: true

.github/workflows/release.yaml

@@ -25,7 +25,7 @@ jobs:
           log-lines = 1000
 
     - name: Github cache ~/.cabal/packages, ~/.cabal/store and dist-newstyle
-      uses: actions/cache@v2.1.5
+      uses: actions/cache@v4
       with:
         path: |
           ~/.cabal/packages
@@ -36,16 +36,17 @@ jobs:
 
     - name: Prepare nix shell
       run:
-        nix develop --accept-flake-config --build
+        nix develop --build
 
     - name: Cabal check
       run: |
         cd quickcheck-dynamic
-        nix develop --accept-flake-config --command cabal check
+        nix develop --command cabal check
 
     - name: Package
-      run:
-        nix develop --accept-flake-config --command cabal sdist quickcheck-dynamic
+      run: |
+        nix develop --command cabal sdist quickcheck-dynamic
+        nix develop --command cabal haddock --haddock-for-hackage quickcheck-dynamic
 
     - name: Get the version
       id: get_version
@@ -54,5 +55,7 @@ jobs:
     - name: Upload distribution
       uses: actions/upload-artifact@v2
       with:
-        name: quickcheck-dynamic.tar.gz
-        path: ./dist-newstyle/sdist/quickcheck-dynamic-${{ steps.get_version.outputs.VERSION }}.tar.gz
+        name: distribution
+        path: |
+          ./dist-newstyle/sdist/quickcheck-dynamic-${{ steps.get_version.outputs.VERSION }}.tar.gz
+          ./dist-newstyle/quickcheck-dynamic-${{ steps.get_version.outputs.VERSION }}-docs.tar.gz