merged

JobPetrovcic · Apr 10, 2024 · 084dad7 · 084dad7
1 parent 373eda1
commit 084dad7
Show file tree

Hide file tree

Showing 12 changed files with 50 additions and 32 deletions.
diff --git a/.github/workflows/cabal.yml b/.github/workflows/cabal.yml
@@ -105,7 +105,7 @@ jobs:
         - Linux
         ghc-ver:
         - 9.6.1
-        - 9.4.4
+        - 9.4.5
         - 9.2.7
         - 9.0.2
         - 8.10.7

diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml
@@ -40,7 +40,7 @@ jobs:
       with:
         enable-stack: true
         ghc-version: ${{ matrix.ghc-ver }}
-        stack-version: ${{ matrix.stack-ver }}
+        stack-version: latest
     - name: Environment settings based on the Haskell setup
       run: |
         echo "runner.os         = ${{ runner.os                               }}"
@@ -54,11 +54,11 @@ jobs:
         echo "stack-exe         = ${{ steps.haskell-setup.outputs.stack-exe   }}"
         echo "stack-root        = ${{ steps.haskell-setup.outputs.stack-root  }}"
         echo "STACK_ROOT (orig) = ${{ env.STACK_ROOT                          }}"
-        echo "STACK_ROOT=${{ steps.haskell-setup.outputs.stack-root }}" >> ${GITHUB_ENV}
-        echo "STACK_VER=$(stack --numeric-version)"                     >> ${GITHUB_ENV}
-        export GHC_VER=$(ghc --numeric-version)
-        echo "GHC_VER=${GHC_VER}"                                       >> ${GITHUB_ENV}
-        echo "ARGS=--stack-yaml=stack-${GHC_VER}.yaml --system-ghc --no-terminal"    >> ${GITHUB_ENV}
+        echo "STACK_ROOT=${{ steps.haskell-setup.outputs.stack-root }}" >> "${GITHUB_ENV}"
+        echo "STACK_VER=$(stack --numeric-version)"                     >> "${GITHUB_ENV}"
+        GHC_VER=$(ghc --numeric-version)
+        echo "GHC_VER=${GHC_VER}"                                       >> "${GITHUB_ENV}"
+        echo "ARGS=--stack-yaml=stack-${GHC_VER}.yaml --system-ghc --no-terminal"    >> "${GITHUB_ENV}"
     - if: ${{ runner.os == 'Windows' }}
       name: Install the icu library (Windows)
       run: |
@@ -99,13 +99,13 @@ jobs:
       fail-fast: false
       matrix:
         ghc-ver:
-        - 9.4.4
+        - 9.4.5
+        include:
+        - ghc-ver: 9.4.4
+          os: windows-2022
         os:
         - ubuntu-22.04
         - macos-12
-        - windows-2022
-        stack-ver:
-        - 2.9.3
     timeout-minutes: 60
 name: Build (stack)
 'on':
@@ -115,6 +115,7 @@ name: Build (stack)
     - Agda.cabal
     - Setup.hs
     - stack-9.4.4.yaml
+    - stack-9.4.5.yaml
     - src/size-solver/size-solver.cabal
   push:
     branches:
@@ -126,5 +127,6 @@ name: Build (stack)
     - Agda.cabal
     - Setup.hs
     - stack-9.4.4.yaml
+    - stack-9.4.5.yaml
     - src/size-solver/size-solver.cabal
   workflow_dispatch: null
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,7 +8,7 @@
 env:
   AGDA_TESTS_OPTIONS: -j${PARALLEL_TESTS} --hide-successes
   BUILD_DIR: dist
-  GHC_VER: 9.4.4
+  GHC_VER: 9.4.5
   PARALLEL_TESTS: 2
   STACK: stack --system-ghc
   STACK_VER: 2.9.3

diff --git a/Agda.cabal b/Agda.cabal
@@ -35,7 +35,8 @@ description:
     packages.
 
 tested-with:
-    GHC == 9.4.4
+    GHC == 9.6.1
+    GHC == 9.4.5
     GHC == 9.2.7
     GHC == 9.0.2
     GHC == 8.10.7
@@ -85,6 +86,7 @@ extra-doc-files:
     doc/release-notes/2.2.0.md
 
 extra-source-files:
+    stack-9.4.5.yaml
     stack-9.4.4.yaml
     stack-9.2.7.yaml
     stack-9.0.2.yaml

diff --git a/doc/user-manual/getting-started/installation.rst b/doc/user-manual/getting-started/installation.rst
@@ -38,7 +38,7 @@ You need recent versions of the following programs to compile Agda:
 * GHC:           https://www.haskell.org/ghc/
 
   + Agda has been tested with GHC 8.6.5, 8.8.4,
-    8.10.7, 9.0.2, 9.2.7 and 9.4.4.
+    8.10.7, 9.0.2, 9.2.7, 9.4.5 and 9.6.1.
 
 * cabal-install: https://www.haskell.org/cabal/
 * Alex:          https://www.haskell.org/alex/

diff --git a/src/full/Agda/Interaction/Highlighting/Sexp/Base.hs b/src/full/Agda/Interaction/Highlighting/Sexp/Base.hs
@@ -229,6 +229,7 @@ instance Sexpable AI.Sort where
         sexpify (AI.SSet lvl) = constr "sort-sset" [toSexp lvl]
         sexpify AI.SizeUniv = constr "sort-size" []
         sexpify AI.LockUniv = constr "sort-lock" []
+        sexpify AI.LevelUniv = constr "sort-level" []
         sexpify AI.IntervalUniv = constr "sort-interval" []
         sexpify (AI.PiSort (AI.Dom _ _ _ _ t) s a) = constr "sort-pi" [toSexp t, toSexp s, toSexp a]
         sexpify (AI.FunSort t u) = constr "sort-fun" [toSexp t, toSexp u]

diff --git a/src/github/workflows/cabal.yml b/src/github/workflows/cabal.yml
@@ -50,7 +50,7 @@ jobs:
       matrix:
         os: [ubuntu-22.04]
         description: [Linux]      ## This just for pretty-printing the job name.
-        ghc-ver: [9.6.1, 9.4.4, 9.2.7, 9.0.2, 8.10.7, 8.8.4, 8.6.5]
+        ghc-ver: [9.6.1, 9.4.5, 9.2.7, 9.0.2, 8.10.7, 8.8.4, 8.6.5]
         # Need to mention "cabal-ver" at least once in the matrix, otherwise matrix.cabal-ver is an actionlint error.
         cabal-ver: ['3.10']
         cabal-flags: ['--enable-tests -f enable-cluster-counting']

diff --git a/src/github/workflows/stack.yml b/src/github/workflows/stack.yml
@@ -12,6 +12,7 @@ on:
     - 'Agda.cabal'
     - 'Setup.hs'
     - 'stack-9.4.4.yaml'
+    - 'stack-9.4.5.yaml'
       # !!! MATCH THIS WITH ghc_ver IN THE matrix BELOW !!!
       #
     - 'src/size-solver/size-solver.cabal'
@@ -52,9 +53,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04,macos-12,windows-2022]
-        stack-ver: ['2.9.3']
-        ghc-ver: [9.4.4]
+        os: [ubuntu-22.04,macos-12]
+        ghc-ver: [9.4.5]
           # !!! MAKE SURE THIS GHC VERSION IS IN SYNC WITH trigger_path_list !!!
           #
           # The LTS snapshots are covered in workflow stack-dry-run.yml.
@@ -65,6 +65,10 @@ jobs:
           # because ghc-ver is to pick the stack-$(ghc-ver).yaml file.
           # If switching to a new GHC minor version needs manual action, i.e.,
           # adding the respective stack-x.y.z.yaml file.
+        include:
+        - os: windows-2022
+          ghc-ver: 9.4.4
+          # !!! MAKE SURE THIS GHC VERSION IS IN SYNC WITH trigger_path_list !!!
 
     # # Try "allowed-failure" for Windows with GHC 9.2
     # continue-on-error: ${{ startsWith(matrix.os, 'windows') && startsWith(matrix.ghc-ver,'9.2') }}
@@ -118,7 +122,7 @@ jobs:
       id: haskell-setup
       with:
         ghc-version: ${{ matrix.ghc-ver }}
-        stack-version: ${{ matrix.stack-ver }}
+        stack-version: latest
         enable-stack: true
 
     - name: Environment settings based on the Haskell setup
@@ -134,11 +138,11 @@ jobs:
         echo "stack-exe         = ${{ steps.haskell-setup.outputs.stack-exe   }}"
         echo "stack-root        = ${{ steps.haskell-setup.outputs.stack-root  }}"
         echo "STACK_ROOT (orig) = ${{ env.STACK_ROOT                          }}"
-        echo "STACK_ROOT=${{ steps.haskell-setup.outputs.stack-root }}" >> ${GITHUB_ENV}
-        echo "STACK_VER=$(stack --numeric-version)"                     >> ${GITHUB_ENV}
-        export GHC_VER=$(ghc --numeric-version)
-        echo "GHC_VER=${GHC_VER}"                                       >> ${GITHUB_ENV}
-        echo "ARGS=--stack-yaml=stack-${GHC_VER}.yaml --system-ghc --no-terminal"    >> ${GITHUB_ENV}
+        echo "STACK_ROOT=${{ steps.haskell-setup.outputs.stack-root }}" >> "${GITHUB_ENV}"
+        echo "STACK_VER=$(stack --numeric-version)"                     >> "${GITHUB_ENV}"
+        GHC_VER=$(ghc --numeric-version)
+        echo "GHC_VER=${GHC_VER}"                                       >> "${GITHUB_ENV}"
+        echo "ARGS=--stack-yaml=stack-${GHC_VER}.yaml --system-ghc --no-terminal"    >> "${GITHUB_ENV}"
     # From now on, use env.GHC_VER rather than matrix.ghc-ver
 
     # Note that msys2 libraries have to be installed via
@@ -181,7 +185,6 @@ jobs:
       uses: actions/cache@v3
       id:   cache
       with:
-        # Note that matrix.stack-ver might be simply 'latest', so we use STACK_VER.
         # We include stack-${GHC_VER}.yaml in the primary cache key so that the cache gets rewritten
         # everytime the resolver updates or extra-deps are added.
         # 2023-03-28: We also include Agda.cabal so that the cache gets rewritten if a new dependency is added.

diff --git a/src/github/workflows/test.yml b/src/github/workflows/test.yml
@@ -53,7 +53,7 @@ env:
   # Andreas, 2022-03-26, 2022-11-28:
   # GHC_VER should be given as x.y.z (as opposed to x.y only)
   # because it is used verbatim when referring to stack-x.y.z.yaml.
-  GHC_VER: "9.4.4"
+  GHC_VER: "9.4.5"
 
   # Part 2: Variables that should not have to be changed
   ###########################################################################

diff --git a/stack-9.2.7.yaml b/stack-9.2.7.yaml
@@ -1,4 +1,4 @@
-resolver: lts-20.13
+resolver: lts-20.18
 compiler: ghc-9.2.7
 compiler-check: match-exact
 

diff --git a/stack-9.4.4.yaml b/stack-9.4.4.yaml
@@ -1,14 +1,12 @@
-resolver: nightly-2022-12-26
-compiler: ghc-9.4.3
+resolver: nightly-2023-04-24
+compiler: ghc-9.4.4
 compiler-check: match-exact
 
+# Local packages specified by relative directory name.
 packages:
 - '.'
 - 'src/size-solver'
 
 flags:
   mintty:
     win32-2-13-1: false
-
-extra-deps:
-- vector-hashtables-0.1.1.1
diff --git a/stack-9.4.5.yaml b/stack-9.4.5.yaml
@@ -0,0 +1,12 @@
+resolver: nightly-2023-04-25
+compiler: ghc-9.4.5
+compiler-check: match-exact
+
+# Local packages specified by relative directory name.
+packages:
+- '.'
+- 'src/size-solver'
+
+flags:
+  mintty:
+    win32-2-13-1: false