Bump to Stackage LTS 20.26

.github/workflows/haskell.yml

@@ -1,4 +1,4 @@
-name: Haskell CI
+name: Stack CI
 
 on:
   push:
@@ -15,35 +15,55 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Install required libraries
       run: >-
         sudo apt install
         z3
 
+    # Use preinstalled Stack.  Should Stack fail to be installed, use the setup action:
+    # - name: Setup Haskell
+    #   uses: haskell-actions/setup@v2
+    #   with:
+    #     enable-stack: true
+    #     stack-no-global: true
 
-    - name: Cache Stack build artifacts (user + project)
-      uses: actions/cache@v3
+    - name: Restore Stack build artifacts (user + project)
+      uses: actions/cache/restore@v4
+      id: cache
       with:
         path: |
           ~/.stack
           .stack-work
-        # best effort for cache: tie it to Stack resolver and package config
-        key: ${{ runner.os }}-stack-${{ hashFiles('stack.yaml.lock', 'package.yaml') }}
+        # Write a fresh cache each time
+        key: ${{ runner.os }}-stack-${{ github.sha }}
         restore-keys: |
           ${{ runner.os }}-stack
 
-
-    - name: Setup Haskell
-      uses: actions/setup-haskell@v1
-
-    - name: Install GHC using Stack
-      if: steps.ghc.outputs.cache-hit != 'true'
-      run: stack setup --install-ghc  
-
-    - name: Build
-      run: stack build
+    - name: Setup Stack
+      run: stack setup
+
+    - name: Build dependencies
+      run: stack test --only-dependencies
+
+    # This step only consumes an extra minute without gains.
+    # - name: Build w/o tests
+    #   run: stack build
+
+    - name: Build w/ tests
+      run: stack test --no-run-tests
 
     - name: Run tests
       run: stack test
+
+    # Always cache dependencies.
+    # This makes esp. sense now that some tests are broken.
+    - name: Cache Stack build artifacts (user + project)
+      uses: actions/cache/save@v4
+      if:   always() && steps.cache.outputs.cache-hit != 'true'
+      with:
+        path: |
+          ~/.stack
+          .stack-work
+        key: ${{ steps.cache.outputs.cache-primary-key }}

examples/Capabilities.gr.output

@@ -0,0 +1 @@
+()

examples/effects_nondet.gr.output

@@ -0,0 +1 @@
+Next (True, True) (Next (True, False) (Next (False, True) (Next (False, False) Empty)))

examples/rankN.gr.output

@@ -0,0 +1 @@
+((42, 'a'), (42, ()))

examples/sensitivity.gr.output

@@ -0,0 +1 @@
+413.5

frontend/granule-frontend.cabal

@@ -1,11 +1,11 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
 name:           granule-frontend
-version:        0.9.4.0
+version:        0.9.5.0
 synopsis:       The Granule abstract-syntax-tree, parser and type checker libraries
 homepage:       https://github.com/granule-project/granule#readme
 bug-reports:    https://github.com/granule-project/granule/issues

interpreter/granule-interpreter.cabal

@@ -1,11 +1,11 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
 name:           granule-interpreter
-version:        0.9.4.0
+version:        0.9.5.0
 synopsis:       The Granule interpreter
 homepage:       https://github.com/dorchard/granule#readme
 bug-reports:    https://github.com/dorchard/granule/issues
@@ -42,6 +42,7 @@ library
     , base >=4.10 && <5
     , clock
     , concurrent-extra
+    , containers
     , directory
     , extra
     , filepath
@@ -77,6 +78,7 @@ executable gr
     , base >=4.10 && <5
     , clock
     , concurrent-extra
+    , containers
     , directory
     , extra
     , filepath
@@ -112,6 +114,7 @@ test-suite gr-golden
     , base >=4.10 && <5
     , clock
     , concurrent-extra
+    , containers
     , directory
     , extra
     , filepath

repl/granule-repl.cabal

@@ -1,11 +1,11 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
 name:           granule-repl
-version:        0.9.4.0
+version:        0.9.5.0
 synopsis:       The Granule interactive interpreter (grepl)
 homepage:       https://github.com/dorchard/granule#readme
 bug-reports:    https://github.com/dorchard/granule/issues

server/granule-language-server.cabal

@@ -1,11 +1,11 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
 name:           granule-language-server
-version:        0.9.4.0
+version:        0.9.5.0
 synopsis:       The Granule language server (grls)
 author:         Daniel Marshall
 maintainer:     Daniel Marshall

stack.yaml

@@ -1,4 +1,4 @@
-resolver: lts-20.0
+resolver: lts-20.26
 packages:
 - frontend/
 - interpreter/
@@ -9,17 +9,11 @@ packages:
 - benchmark/
 
 # Dependency packages to be pulled from upstream that are not in the resolver
-# (e.g., acme-missiles-0.3)
 extra-deps:
-- ConfigFile-1.1.4
-- text-replace-0.1.0.2
-- syz-0.2.0.0@sha256:7307acb8f6ae7720e7e235c974281ecee912703c1394ebcac19caf83d70bb492,2345
-- clock-0.8.3
-# Dependencies for language server
-- lsp-1.6.0.0
-- co-log-core-0.3.1.0
+- text-replace-0.1.0.3
+- syz-0.2.0.0
 - git: https://github.com/jackohughes/haskell-src-exts
-  commit: 5c2647fa0746bdac046897f5a6b7e4f5ef3afa79 
+  commit: 5c2647fa0746bdac046897f5a6b7e4f5ef3afa79
 
 # Override default flag values for local packages and extra-deps
 flags: {}
@@ -40,8 +34,9 @@ extra-package-dbs: []
 #
 # Extra directories used by stack for building
 
-extra-include-dirs:
-- /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi
+## Superfluous?
+# extra-include-dirs:
+# - /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi
 
 # extra-lib-dirs: [/path/to/dir]