Skip to content

Commit

Permalink
Merge pull request #24 from commercialhaskell/test-update
Browse files Browse the repository at this point in the history
Update tests
  • Loading branch information
mpilgrem authored Oct 21, 2024
2 parents 88d8587 + 885eb5f commit 67e91f8
Show file tree
Hide file tree
Showing 22 changed files with 40 additions and 36 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- stack-ghc-9.2.8.yaml
- stack-ghc-9.4.7.yaml
- stack-ghc-9.6.6.yaml
- stack-ghc-9.8.2.yaml
- stack-ghc-9.8.3.yaml
- stack-ghc-9.10.1.yaml
exclude:
- os: macos-latest
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
/.stack-work/
*~
*.yaml.lock
5 changes: 5 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to the
[Haskell Package Versioning Policy](https://pvp.haskell.org/).

## 0.1.7.0 - 2024-10-21

* Add support for GHC 9.12 (GHC 9.12.1 onward). See
[#23](https://github.com/commercialhaskell/hi-file-parser/pull/23)

## 0.1.6.0 - 2023-11-04

* Add further support for GHC 9.8 (GHC 9.8.1 onward). See
Expand Down
20 changes: 12 additions & 8 deletions hi-file-parser.cabal
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cabal-version: 1.12

-- This file has been generated from package.yaml by hpack version 0.36.0.
-- This file has been generated from package.yaml by hpack version 0.37.0.
--
-- see: https://github.com/sol/hpack

name: hi-file-parser
version: 0.1.6.0
version: 0.1.7.0
synopsis: Parser for GHC's hi files
description: Please see the README on Github at <https://github.com/commercialhaskell/hi-file-parser/blob/master/README.md>
category: Development
Expand Down Expand Up @@ -35,16 +35,20 @@ extra-source-files:
test-files/iface/x64/ghc8107/X.hi
test-files/iface/x64/ghc9002/Main.hi
test-files/iface/x64/ghc9002/X.hi
test-files/iface/x64/ghc9027/Main.hi
test-files/iface/x64/ghc9027/X.hi
test-files/iface/x64/ghc9028/Main.hi
test-files/iface/x64/ghc9028/X.hi
test-files/iface/x64/ghc9044/Main.hi
test-files/iface/x64/ghc9044/X.hi
test-files/iface/x64/ghc9047/Main.hi
test-files/iface/x64/ghc9047/X.hi
test-files/iface/x64/ghc9063/Main.hi
test-files/iface/x64/ghc9063/X.hi
test-files/iface/x64/ghc9081/Main.hi
test-files/iface/x64/ghc9081/X.hi
test-files/iface/x64/ghc9066/Main.hi
test-files/iface/x64/ghc9066/X.hi
test-files/iface/x64/ghc9083/Main.hi
test-files/iface/x64/ghc9083/X.hi
test-files/iface/x64/ghc9101/Main.hi
test-files/iface/x64/ghc9101/X.hi
test-files/iface/x64/ghc9120/Main.hi
test-files/iface/x64/ghc9120/X.hi

source-repository head
type: git
Expand Down
18 changes: 11 additions & 7 deletions package.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: hi-file-parser
version: 0.1.6.0
version: 0.1.7.0
github: commercialhaskell/hi-file-parser
license: BSD3
author: Hussein Ait-Lahcen
Expand All @@ -24,16 +24,20 @@ extra-source-files:
- test-files/iface/x64/ghc8107/X.hi
- test-files/iface/x64/ghc9002/Main.hi
- test-files/iface/x64/ghc9002/X.hi
- test-files/iface/x64/ghc9027/Main.hi
- test-files/iface/x64/ghc9027/X.hi
- test-files/iface/x64/ghc9028/Main.hi
- test-files/iface/x64/ghc9028/X.hi
- test-files/iface/x64/ghc9044/Main.hi
- test-files/iface/x64/ghc9044/X.hi
- test-files/iface/x64/ghc9047/Main.hi
- test-files/iface/x64/ghc9047/X.hi
- test-files/iface/x64/ghc9063/Main.hi
- test-files/iface/x64/ghc9063/X.hi
- test-files/iface/x64/ghc9081/Main.hi
- test-files/iface/x64/ghc9081/X.hi
- test-files/iface/x64/ghc9066/Main.hi
- test-files/iface/x64/ghc9066/X.hi
- test-files/iface/x64/ghc9083/Main.hi
- test-files/iface/x64/ghc9083/X.hi
- test-files/iface/x64/ghc9101/Main.hi
- test-files/iface/x64/ghc9101/X.hi
- test-files/iface/x64/ghc9120/Main.hi
- test-files/iface/x64/ghc9120/X.hi

# Metadata used when publishing your package
synopsis: Parser for GHC's hi files
Expand Down
2 changes: 0 additions & 2 deletions stack-ghc-9.8.2.yaml

This file was deleted.

3 changes: 3 additions & 0 deletions stack-ghc-9.8.3.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# GHC 9.8.3
snapshot: nightly-2024-10-21
compiler: ghc-9.8.3
12 changes: 0 additions & 12 deletions stack.yaml.lock

This file was deleted.

6 changes: 3 additions & 3 deletions test-files/iface/x64/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ command `nix-shell --pure --run "generate"`.
~~~
3. Use the correct version of GHC to create the `*.hi` files in the correct
directory (here, we assume that a Stack YAML file already exists in the
repository root directory specifying the relevant snapshot):
directory (here, we assume that a YAML file already exists in the repository
root directory specifying the relevant snapshot):
~~~text
stack --stack-yaml ..\..\..\stack-ghc-x.y.z.yaml ghc -- -fforce-recomp -hidir ghcxyyz Main.hs
stack --snapshot ..\..\..\stack-ghc-x.y.z.yaml ghc -- -fforce-recomp -hidir ghcxyyz Main.hs
~~~
4. Clean up the build artefacts that are not required, the `*.o` files and the
Expand Down
Binary file removed test-files/iface/x64/ghc9027/Main.hi
Binary file not shown.
Binary file added test-files/iface/x64/ghc9028/Main.hi
Binary file not shown.
Binary file not shown.
Binary file removed test-files/iface/x64/ghc9063/Main.hi
Binary file not shown.
Binary file removed test-files/iface/x64/ghc9063/X.hi
Binary file not shown.
Binary file added test-files/iface/x64/ghc9066/Main.hi
Binary file not shown.
Binary file added test-files/iface/x64/ghc9066/X.hi
Binary file not shown.
Binary file removed test-files/iface/x64/ghc9081/Main.hi
Binary file not shown.
Binary file added test-files/iface/x64/ghc9083/Main.hi
Binary file not shown.
Binary file not shown.
Binary file added test-files/iface/x64/ghc9101/Main.hi
Binary file not shown.
Binary file added test-files/iface/x64/ghc9101/X.hi
Binary file not shown.
7 changes: 4 additions & 3 deletions test/HiFileParserSpec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,12 @@ versions64 =
, "ghc8084" -- Last in GHC 8.8 series, using GHC 8.6.1 format
, "ghc8107" -- Last in GHC 8.10 series, using GHC 8.10.1 format
, "ghc9002" -- Last in GHC 9.0 series, using GHC 9.0.1 format
, "ghc9027" -- Last in GHC 9.2 series, using GHC 9.0.1 format
, "ghc9028" -- Last in GHC 9.2 series, using GHC 9.0.1 format
, "ghc9044" -- Last using GHC 9.4.1 format
, "ghc9047" -- Last in GHC 9.4 series, using GHC 9.4.5 format
, "ghc9063" -- Last in GHC 9.6 series, using GHC 9.4.5 format
, "ghc9081" -- First in GHC 9.8 series, using GHC 9.8.1 format
, "ghc9066" -- Last in GHC 9.6 series, using GHC 9.4.5 format
, "ghc9083" -- Last in GHC 9.8 series, using GHC 9.8.1 format
, "ghc9101" -- Last in GHC 9.10 series, using GHC 9.8.1 format
, "ghc9120" -- First in GHC 9.12 series, using GHC 9.12 format
]

Expand Down

0 comments on commit 67e91f8

Please sign in to comment.