Skip to content

Commit

Permalink
Bump GHC 9.8.1 to 9.8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
andreasabel committed Mar 9, 2024
1 parent aa5d8bb commit fc866f9
Show file tree
Hide file tree
Showing 19 changed files with 39 additions and 39 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/cabal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
CABAL_VER: ${{ matrix.cabal-ver || '3.10' }}
FLAGS: ${{ matrix.cabal-flags || '--enable-tests -f enable-cluster-counting'
}}
GHC_VER: ${{ matrix.ghc-ver || '9.8.1' }}
GHC_VER: ${{ matrix.ghc-ver || '9.8.2' }}
name: Cabal ${{ matrix.description }}, ${{ matrix.ghc-ver }}
needs: auto-cancel
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
doctest:
- false
ghc-ver:
- 9.8.1
- 9.8.2
- 9.6.4
- 9.4.8
- 9.2.8
Expand All @@ -122,22 +122,22 @@ jobs:
- cabal-flags: --disable-tests
description: Linux doctest
doctest: true
ghc-ver: 9.8.1
ghc-ver: 9.8.2
os: ubuntu-22.04
- cabal-flags: --enable-tests -f debug
description: Linux debug
ghc-ver: 9.8.1
ghc-ver: 9.8.2
os: ubuntu-22.04
- cabal-flags: --enable-tests -f enable-cluster-counting -f debug -f debug-serialisation
-f debug-parsing -c containers>=0.7 --allow-newer=containers
description: Linux containers 0.7
ghc-ver: 9.8.1
ghc-ver: 9.8.2
os: ubuntu-22.04
- description: macOS
ghc-ver: 9.8.1
ghc-ver: 9.8.2
os: macos-12
- description: Windows
ghc-ver: 9.8.1
ghc-ver: 9.8.2
os: windows-2022
os:
- ubuntu-22.04
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/haddock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
cabal-ver:
- '3.10'
ghc-ver:
- 9.8.1
- 9.8.2
os:
- ubuntu-22.04
name: Haddock
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/stack-dry-run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ name: Stack check snapshots
- Agda.cabal
- Setup.hs
- stack-*.yaml
- '!stack-9.8.1.yaml'
- '!stack-9.8.2.yaml'
- src/size-solver/size-solver.cabal
push:
branches:
Expand All @@ -104,6 +104,6 @@ name: Stack check snapshots
- Agda.cabal
- Setup.hs
- stack-*.yaml
- '!stack-9.8.1.yaml'
- '!stack-9.8.2.yaml'
- src/size-solver/size-solver.cabal
workflow_dispatch: null
8 changes: 4 additions & 4 deletions .github/workflows/stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ jobs:
fail-fast: false
matrix:
ghc-ver:
- 9.8.1
- 9.8.2
include:
- ghc-ver: 9.8.1
- ghc-ver: 9.8.2
os: windows-2022
os:
- ubuntu-22.04
Expand All @@ -121,7 +121,7 @@ name: Build (stack)
- .github/workflows/stack.yml
- Agda.cabal
- Setup.hs
- stack-9.8.1.yaml
- stack-9.8.2.yaml
- src/size-solver/size-solver.cabal
push:
branches:
Expand All @@ -132,6 +132,6 @@ name: Build (stack)
- .github/workflows/stack.yml
- Agda.cabal
- Setup.hs
- stack-9.8.1.yaml
- stack-9.8.2.yaml
- src/size-solver/size-solver.cabal
workflow_dispatch: null
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
env:
AGDA_TESTS_OPTIONS: -j${PARALLEL_TESTS} --hide-successes
BUILD_DIR: dist
GHC_VER: 9.8.1
GHC_VER: 9.8.2
PARALLEL_TESTS: 2
STACK: stack --system-ghc
STACK_VER: 2.13.1
Expand Down
4 changes: 2 additions & 2 deletions Agda.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ description:
packages.

tested-with:
GHC == 9.8.1
GHC == 9.8.2
GHC == 9.6.4
GHC == 9.4.8
GHC == 9.2.8
Expand Down Expand Up @@ -90,7 +90,7 @@ extra-doc-files:
doc/release-notes/2.2.0.md

extra-source-files:
stack-9.8.1.yaml
stack-9.8.2.yaml
stack-9.6.4.yaml
stack-9.4.8.yaml
stack-9.2.8.yaml
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Highlights
Installation
------------

* Agda supports GHC versions 8.6.5 to 9.8.1.
* Agda supports GHC versions 8.6.5 to 9.8.2.

Pragmas and options
-------------------
Expand Down
2 changes: 1 addition & 1 deletion doc/user-manual/getting-started/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.8, 9.4.8, 9.6.4, and 9.8.1.
8.10.7, 9.0.2, 9.2.8, 9.4.8, 9.6.4, and 9.8.2.

* cabal-install: https://www.haskell.org/cabal/
* Alex: https://www.haskell.org/alex/
Expand Down
2 changes: 1 addition & 1 deletion src/agda-bisect/agda-bisect.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ cabal-version: >= 1.10
author: Nils Anders Danielsson
build-type: Simple
tested-with:
GHC == 9.8.1
GHC == 9.8.2
GHC == 9.6.3
GHC == 9.4.7
GHC == 9.2.8
Expand Down
2 changes: 1 addition & 1 deletion src/github/workflows/cabal-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
# matrix:
# os:
# - ubuntu-latest
# ghc-ver: ['9.8.1']
# ghc-ver: ['9.8.2']
# cabal-ver: ['3.10.1.0']
# # Use the versions preinstalled in the virtual environment, if possible.

Expand Down
14 changes: 7 additions & 7 deletions src/github/workflows/cabal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
matrix:
os: [ubuntu-22.04]
description: [Linux] ## This just for pretty-printing the job name.
ghc-ver: [9.8.1, 9.6.4, 9.4.8, 9.2.8, 9.0.2, 8.10.7, 8.8.4, 8.6.5]
ghc-ver: [9.8.2, 9.6.4, 9.4.8, 9.2.8, 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']
Expand All @@ -61,21 +61,21 @@ jobs:
# Linux, without tests but with doctest
- os: ubuntu-22.04
description: Linux doctest
ghc-ver: '9.8.1'
ghc-ver: '9.8.2'
# Can't leave cabal-flags empty here lest it becomes the default value.
cabal-flags: '--disable-tests'
doctest: true

# Linux, without -f enable-cluster-counting but with -f debug
- os: ubuntu-22.04
description: Linux debug
ghc-ver: '9.8.1'
ghc-ver: '9.8.2'
cabal-flags: '--enable-tests -f debug'

# Linux, with containers-0.7 and everything
- os: ubuntu-22.04
description: Linux containers 0.7
ghc-ver: '9.8.1'
ghc-ver: '9.8.2'
## Andreas, 2023-09-28: Test containers-0.7 here which has breaking changes.
## Note: -c 'containers >= 0.7' with single quotes does not get communicated properly.
## (The single quotes stay, and "-c 'containers" is an option parse error for cabal.)
Expand All @@ -86,16 +86,16 @@ jobs:
# macOS with default flags
- os: macos-12
description: macOS
ghc-ver: '9.8.1'
ghc-ver: '9.8.2'

# Windows with default flags
- os: windows-2022
description: Windows
ghc-ver: '9.8.1'
ghc-ver: '9.8.2'

# Default values
env:
GHC_VER: ${{ matrix.ghc-ver || '9.8.1' }}
GHC_VER: ${{ matrix.ghc-ver || '9.8.2' }}
CABAL_VER: ${{ matrix.cabal-ver || '3.10' }}
FLAGS: ${{ matrix.cabal-flags || '--enable-tests -f enable-cluster-counting' }}

Expand Down
2 changes: 1 addition & 1 deletion src/github/workflows/haddock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
# not for the virtual environments, and also haskell/action/setup
# is usually not up-to-date.
os: [ubuntu-22.04]
ghc-ver: ['9.8.1']
ghc-ver: ['9.8.2']
cabal-ver: ['3.10']
# Use the versions the come with the virtual environment, if possible.

Expand Down
2 changes: 1 addition & 1 deletion src/github/workflows/stack-dry-run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
- 'Agda.cabal'
- 'Setup.hs'
- 'stack-*.yaml'
- '!stack-9.8.1.yaml'
- '!stack-9.8.2.yaml'
- 'src/size-solver/size-solver.cabal'

pull_request:
Expand Down
6 changes: 3 additions & 3 deletions src/github/workflows/stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
- '.github/workflows/stack.yml'
- 'Agda.cabal'
- 'Setup.hs'
- 'stack-9.8.1.yaml'
- 'stack-9.8.2.yaml'
# !!! MATCH THIS WITH ghc_ver IN THE matrix BELOW !!!
#
- 'src/size-solver/size-solver.cabal'
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-22.04,macos-12]
ghc-ver: [9.8.1]
ghc-ver: [9.8.2]
# !!! MAKE SURE THIS GHC VERSION IS IN SYNC WITH trigger_path_list !!!
#
# The LTS snapshots are covered in workflow stack-dry-run.yml.
Expand All @@ -66,7 +66,7 @@ jobs:
# adding the respective stack-x.y.z.yaml file.
include:
- os: windows-2022
ghc-ver: 9.8.1
ghc-ver: 9.8.2
# !!! MAKE SURE THIS GHC VERSION IS IN SYNC WITH trigger_path_list !!!

# # Try "allowed-failure" for Windows with GHC 9.2
Expand Down
2 changes: 1 addition & 1 deletion src/github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,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.8.1"
GHC_VER: "9.8.2"

# Part 2: Variables that should not have to be changed
###########################################################################
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ build-type: Simple
cabal-version: >= 1.10

tested-with:
GHC == 9.8.1
GHC == 9.8.2
GHC == 9.6.4
GHC == 9.4.8
GHC == 9.2.8
Expand Down
2 changes: 1 addition & 1 deletion src/size-solver/size-solver.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ synopsis: A solver for size constraints arising in sized types.
description:
See Felix Reihl, 2013, Bachelor thesis, Ludwig-Maximilians-University.
tested-with:
GHC == 9.8.1
GHC == 9.8.2
GHC == 9.6.4
GHC == 9.4.8
GHC == 9.2.8
Expand Down
2 changes: 1 addition & 1 deletion stack-9.6.4.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-22.12
resolver: lts-22.13
compiler: ghc-9.6.4
compiler-check: match-exact

Expand Down
4 changes: 2 additions & 2 deletions stack-9.8.1.yaml → stack-9.8.2.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
resolver: nightly-2024-02-27
compiler: ghc-9.8.1
resolver: nightly-2024-03-08
compiler: ghc-9.8.2
compiler-check: match-exact

# Local packages specified by relative directory name.
Expand Down

0 comments on commit fc866f9

Please sign in to comment.