Skip to content

Commit

Permalink
Merge pull request #8 from Kleidukos/support-9.8.2
Browse files Browse the repository at this point in the history
Support GHC 9.8.2
  • Loading branch information
Kleidukos committed Jul 21, 2024
2 parents efd2032 + 59ff35c commit 51040ff
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 5 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Tests Pipeline

on:
pull_request:
push:
branches: ['main']

Expand Down
25 changes: 21 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
- "v*"

jobs:

generate-matrix:
name: 'Generate matrix from cabal'
outputs:
Expand All @@ -21,6 +22,20 @@ jobs:
ubuntu-version: 'latest'
macos-version: 'latest'
version: 0.1.7.1

generate-alpine-matrix:
name: 'Generate Alpine matrix from cabal'
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
runs-on: ubuntu-latest
steps:
- name: Extract the tested GHC versions
id: set-matrix
uses: kleidukos/[email protected]
with:
cabal-file: dump-decls.cabal
version: 0.1.7.1
ubuntu-version: 'latest'
tests:
name: ${{ matrix.ghc }} on ${{ matrix.os }}
needs: generate-matrix
Expand Down Expand Up @@ -83,10 +98,12 @@ jobs:
path: ${{ env.GETTESTED_EXEC_TAR }}

build-alpine:
name: 9.10.1 on alpine-3.19
runs-on: ubuntu-latest
name: ${{ matrix.ghc }} on alpine-3.19
needs: generate-alpine-matrix
runs-on: ${{ matrix.os }}
strategy:
matrix: ${{ fromJSON(needs.generate-alpine-matrix.outputs.matrix) }}
container: 'alpine:3.19'
needs: generate-matrix
steps:
- name: Install extra dependencies
shell: sh
Expand All @@ -102,7 +119,7 @@ jobs:
- uses: haskell-actions/setup@v2
id: setup-haskell
with:
ghc-version: '9.10.1'
ghc-version: ${{ matrix.ghc }}
cabal-version: 'latest'

- name: Configure
Expand Down
16 changes: 16 additions & 0 deletions compat/9.8.2/GHC/Compat.hs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
-- GHC 9.10.1 Compatibility
module GHC.Compat where

import GHC (ModuleInfo, modInfoExports)

Check warning on line 4 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on ubuntu-latest

The import of ‘modInfoExports’ from module ‘GHC’ is redundant

Check warning on line 4 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on ubuntu-latest

The import of ‘modInfoExports’ from module ‘GHC’ is redundant

Check warning on line 4 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on alpine-3.19

The import of ‘modInfoExports’ from module ‘GHC’ is redundant

Check warning on line 4 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on macos-latest

The import of ‘modInfoExports’ from module ‘GHC’ is redundant

Check warning on line 4 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on macos-latest

The import of ‘modInfoExports’ from module ‘GHC’ is redundant

Check warning on line 4 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on alpine-3.19

The import of ‘modInfoExports’ from module ‘GHC’ is redundant

Check warning on line 4 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on macos-latest

The import of ‘modInfoExports’ from module ‘GHC’ is redundant

Check warning on line 4 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on ubuntu-latest

The import of ‘modInfoExports’ from module ‘GHC’ is redundant
import GHC.Iface.Syntax (AltPpr (..), ShowForAllFlag (..), ShowHowMuch (..), ShowSub (..))
import GHC.Types.Name (OccName, nameOccName)

Check warning on line 6 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on ubuntu-latest

The import of ‘GHC.Types.Name’ is redundant

Check warning on line 6 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on ubuntu-latest

The import of ‘GHC.Types.Name’ is redundant

Check warning on line 6 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on alpine-3.19

The import of ‘GHC.Types.Name’ is redundant

Check warning on line 6 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on macos-latest

The import of ‘GHC.Types.Name’ is redundant

Check warning on line 6 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on macos-latest

The import of ‘GHC.Types.Name’ is redundant

Check warning on line 6 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on alpine-3.19

The import of ‘GHC.Types.Name’ is redundant

Check warning on line 6 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on macos-latest

The import of ‘GHC.Types.Name’ is redundant

Check warning on line 6 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on ubuntu-latest

The import of ‘GHC.Types.Name’ is redundant

import DumpDecls.IgnoredDeclarations

Check warning on line 8 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on ubuntu-latest

The import of ‘DumpDecls.IgnoredDeclarations’ is redundant

Check warning on line 8 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on ubuntu-latest

The import of ‘DumpDecls.IgnoredDeclarations’ is redundant

Check warning on line 8 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on alpine-3.19

The import of ‘DumpDecls.IgnoredDeclarations’ is redundant

Check warning on line 8 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on macos-latest

The import of ‘DumpDecls.IgnoredDeclarations’ is redundant

Check warning on line 8 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on macos-latest

The import of ‘DumpDecls.IgnoredDeclarations’ is redundant

Check warning on line 8 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on alpine-3.19

The import of ‘DumpDecls.IgnoredDeclarations’ is redundant

Check warning on line 8 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on macos-latest

The import of ‘DumpDecls.IgnoredDeclarations’ is redundant

Check warning on line 8 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on ubuntu-latest

The import of ‘DumpDecls.IgnoredDeclarations’ is redundant

mkShowSub :: ModuleInfo -> ShowSub
mkShowSub mod_info =

Check warning on line 11 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on ubuntu-latest

Defined but not used: ‘mod_info’

Check warning on line 11 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on ubuntu-latest

Defined but not used: ‘mod_info’

Check warning on line 11 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on alpine-3.19

Defined but not used: ‘mod_info’

Check warning on line 11 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on macos-latest

Defined but not used: ‘mod_info’

Check warning on line 11 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on macos-latest

Defined but not used: ‘mod_info’

Check warning on line 11 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on alpine-3.19

Defined but not used: ‘mod_info’

Check warning on line 11 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on macos-latest

Defined but not used: ‘mod_info’

Check warning on line 11 in compat/9.8.2/GHC/Compat.hs

View workflow job for this annotation

GitHub Actions / 9.8.2 on ubuntu-latest

Defined but not used: ‘mod_info’
let ss_how_much = ShowSome [] (AltPpr Nothing)
in ShowSub
{ ss_how_much = ss_how_much
, ss_forall = ShowForAllMust
}
6 changes: 5 additions & 1 deletion dump-decls.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ copyright: (c) 2023 Ben Gamari
extra-source-files:
compat/9.10.1/GHC/Compat.hs
compat/9.6.6/GHC/Compat.hs
compat/9.8.2/GHC/Compat.hs

tested-with: GHC ==9.6.6 || ==9.10.1
tested-with: GHC ==9.6.6 || ==9.8.2 || ==9.10.1

common extensions
default-extensions:
Expand Down Expand Up @@ -47,6 +48,9 @@ library
if impl(ghc ==9.10.1)
hs-source-dirs: compat/9.10.1

if impl(ghc ==9.8.2)
hs-source-dirs: compat/9.8.2

if impl(ghc ==9.6.6)
hs-source-dirs: compat/9.6.6

Expand Down

0 comments on commit 51040ff

Please sign in to comment.