Merge pull request #314 from mrd/fix-stack

 Stack at LTS-23.27, Cabal builds under GHC 9.0 thru 9.12

Author: dorchard

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
 
     # relative paths are relative to the project directory
     - name: Cache Stack build artifacts (user + project)
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: |
           ~/.stack
@@ -81,15 +81,15 @@ jobs:
 
     - name: Setup Haskell build environment
       id: setup-haskell-build-env
-      uses: haskell/actions/setup@v2
+      uses: haskell-actions/setup@v2
       with:
         ghc-version: ${{ matrix.ghc }}
-        cabal-version: ${{ matrix.cabal }}
+        cabal-version: 'latest'
 
-    - run: cabal freeze
+    - run: cabal freeze --enable-tests
 
     - name: Cache Cabal build artifacts
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: |
           ${{ steps.setup-haskell-build-env.outputs.cabal-store }}
@@ -99,7 +99,7 @@ jobs:
           ${{ runner.os }}-cabal-${{ matrix.ghc }}
 
     - name: Test
-      run: cabal test --test-show-details=streaming
+      run: cabal test --enable-tests --test-show-details=streaming
       env:
         HSPEC_OPTIONS: --color
 
@@ -118,15 +118,15 @@ jobs:
 
     - name: Setup Haskell build environment
       id: setup-haskell-build-env
-      uses: haskell/actions/setup@v2
+      uses: haskell-actions/setup@v2
       with:
         ghc-version: ${{ matrix.ghc }}
-        cabal-version: ${{ matrix.cabal }}
+        cabal-version: 'latest'
 
-    - run: cabal freeze
+    - run: cabal freeze --enable-tests
 
     - name: Cache Cabal build artifacts
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: |
           ${{ steps.setup-haskell-build-env.outputs.cabal-store }}
@@ -139,7 +139,7 @@ jobs:
       run: cabal install
 
     - name: Test
-      run: cabal test --test-show-details=streaming
+      run: cabal test --enable-tests --test-show-details=streaming
       env:
         HSPEC_OPTIONS: --color
 
@@ -166,15 +166,15 @@ jobs:
 
     - name: Setup Haskell build environment
       id: setup-haskell-build-env
-      uses: haskell/actions/setup@v2
+      uses: haskell-actions/setup@v2
       with:
         ghc-version: ${{ matrix.ghc }}
-        cabal-version: ${{ matrix.cabal }}
+        cabal-version: 'latest'
 
-    - run: cabal freeze
+    - run: cabal freeze --enable-tests
 
     - name: Cache Cabal build artifacts
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: |
           ${{ steps.setup-haskell-build-env.outputs.cabal-store }}
@@ -187,7 +187,7 @@ jobs:
       run: cabal install
 
     - name: Test
-      run: cabal test --test-show-details=streaming
+      run: cabal test --enable-tests --test-show-details=streaming
       env:
         HSPEC_OPTIONS: --color
 
@@ -197,3 +197,10 @@ jobs:
         path: "C:/cabal/bin/${{ env.EXE_NAME }}.exe"
         name: ${{ env.EXE_NAME }}-windows-ghc-${{ matrix.ghc }}-cabal-${{ github.sha }}.exe
         if-no-files-found: error
+
+    - name: Upload cabal build logs
+      if: failure()
+      uses: actions/upload-artifact@v4
+      with:
+        name: cabal-build-logs
+        path: C:\cabal\logs\

fortran-src.cabal

@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.38.0.
+-- This file has been generated from package.yaml by hpack version 0.38.1.
 --
 -- see: https://github.com/sol/hpack
 
@@ -20,7 +20,7 @@ license:        Apache-2.0
 license-file:   LICENSE
 build-type:     Simple
 tested-with:
-    GHC >= 9.0
+    GHC == 9.0, GHC == 9.2, GHC == 9.4, GHC == 9.6, GHC == 9.8, GHC == 9.10, GHC == 9.12
 extra-source-files:
     README.md
     CHANGELOG.md
@@ -187,7 +187,7 @@ library
   build-depends:
       GenericPretty >=1.2.2 && <2
     , array ==0.5.*
-    , base >=4.6 && <5
+    , base >=4.6 && <4.22
     , binary >=0.8.3.0 && <0.11
     , bytestring >=0.10 && <0.13
     , containers >=0.5 && <0.7
@@ -199,9 +199,9 @@ library
     , mtl >=2.2 && <3
     , pretty >=1.1 && <2
     , process >=1.2.0.0
-    , singletons ==3.0.*
-    , singletons-base >=3.0 && <3.4
-    , singletons-th >=3.0 && <3.4
+    , singletons >=3.0 && <3.6
+    , singletons-base >=3.0 && <3.6
+    , singletons-th >=3.0 && <3.6
     , temporary >=1.2 && <1.4
     , text >=1.2 && <2.2
     , uniplate >=1.6 && <2
@@ -250,7 +250,7 @@ executable fortran-src
   build-depends:
       GenericPretty >=1.2.2 && <2
     , array ==0.5.*
-    , base >=4.6 && <5
+    , base >=4.6 && <4.22
     , binary >=0.8.3.0 && <0.11
     , bytestring >=0.10 && <0.13
     , containers >=0.5 && <0.7
@@ -263,9 +263,9 @@ executable fortran-src
     , mtl >=2.2 && <3
     , pretty >=1.1 && <2
     , process >=1.2.0.0
-    , singletons ==3.0.*
-    , singletons-base >=3.0 && <3.4
-    , singletons-th >=3.0 && <3.4
+    , singletons >=3.0 && <3.6
+    , singletons-base >=3.0 && <3.6
+    , singletons-th >=3.0 && <3.6
     , temporary >=1.2 && <1.4
     , text >=1.2 && <2.2
     , uniplate >=1.6 && <2
@@ -348,7 +348,7 @@ test-suite spec
       GenericPretty >=1.2.2 && <2
     , QuickCheck >=2.10 && <2.15
     , array ==0.5.*
-    , base >=4.6 && <5
+    , base >=4.6 && <4.22
     , binary >=0.8.3.0 && <0.11
     , bytestring >=0.10 && <0.13
     , containers >=0.5 && <0.7
@@ -362,9 +362,9 @@ test-suite spec
     , mtl >=2.2 && <3
     , pretty >=1.1 && <2
     , process >=1.2.0.0
-    , singletons ==3.0.*
-    , singletons-base >=3.0 && <3.4
-    , singletons-th >=3.0 && <3.4
+    , singletons >=3.0 && <3.6
+    , singletons-base >=3.0 && <3.6
+    , singletons-th >=3.0 && <3.6
     , temporary >=1.2 && <1.4
     , text >=1.2 && <2.2
     , uniplate >=1.6 && <2

package.yaml

@@ -8,7 +8,7 @@ description: >-
   analysis, a renamer, and type analysis. For example usage, see the
   @<https://hackage.haskell.org/package/camfort CamFort>@ project, which uses
   fortran-src as its front end.
-tested-with: GHC >= 9.0
+tested-with: GHC == 9.0, GHC == 9.2, GHC == 9.4, GHC == 9.6, GHC == 9.8, GHC == 9.10, GHC == 9.12
 github: camfort/fortran-src
 bug-reports: https://github.com/camfort/fortran-src/issues
 author: [Mistral Contrastin, Matthew Danish, Dominic Orchard, Andrew Rice]
@@ -80,7 +80,7 @@ ghc-options:
 #- -Werror # appears bad to do in distribution, can be useful for development
 
 dependencies:
-- base >=4.6 && <5
+- base >=4.6 && <4.22
 - mtl >=2.2 && <3
 - array >=0.5 && <0.6
 - uniplate >=1.6 && <2
@@ -99,11 +99,11 @@ dependencies:
 - either ^>=5.0.1.1
 - process >= 1.2.0.0
 
-- singletons      >= 3.0 && < 3.1
+- singletons      >= 3.0 && < 3.6
 
-# 3.0 = GHC 9.0, 3.1 = GHC 9.2, 3.1.1 = GHC 9.4, 3.2 = GHC 9.6, 3.3 = GHC 9.8
-- singletons-th   >= 3.0 && < 3.4
-- singletons-base >= 3.0 && < 3.4
+# 3.0 = GHC 9.0, 3.1 = GHC 9.2, 3.1.1 = GHC 9.4, 3.2 = GHC 9.6, 3.3 = GHC 9.8, 3.5 = GHC 9.10
+- singletons-th   >= 3.0 && < 3.6
+- singletons-base >= 3.0 && < 3.6
 
 library:
   source-dirs: src

stack.yaml

@@ -1,4 +1,4 @@
-resolver: lts-20.01
+resolver: lts-23.27
 packages:
-- '.'
+  - '.'
 save-hackage-creds: false

stack.yaml.lock

@@ -1,12 +1,12 @@
 # This file was autogenerated by Stack.
 # You should not edit this file by hand.
 # For more information, please see the documentation at:
-#   https://docs.haskellstack.org/en/stable/lock_files
+#   https://docs.haskellstack.org/en/stable/topics/lock_files
 
 packages: []
 snapshots:
 - completed:
-    sha256: b73b2b116143aea728c70e65c3239188998bac5bc3be56465813dacd74215dc5
-    size: 648424
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/1.yaml
-  original: lts-20.1
+    sha256: 069c8189232279d04bd107557d3a62132c04ae5ce3c710649e6b40f67f10b9d5
+    size: 684285
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/23/27.yaml
+  original: lts-23.27