Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support GHC 9.6 #79

Merged
merged 4 commits into from
Jan 3, 2024
Merged

Support GHC 9.6 #79

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a471206
Support GHC 9.6
avdv Jan 2, 2024
8ddea83
Add 9.6 compatibility layer to cabalscan
avdv Jan 2, 2024
73a3de1
Use Cabal_9_4 for GHC >= 9.4
avdv Jan 2, 2024
bbcb0c2
Merge branch 'main' into cb/ghc-9.6.2
mergify[bot] Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ common:ghc_9_2_7 --repo_env=GHC_VERSION=9.2.7

common:ghc_9_4_5 --repo_env=GHC_VERSION=9.4.5

common:ghc_9_6_2 --repo_env=GHC_VERSION=9.6.2

common:bzlmod --enable_bzlmod

# Try to load a file that includes the remote cache authentication flag
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
ghc-version: [ghc_8_10_7, ghc_9_0_2, ghc_9_2_7, ghc_9_4_5]
ghc-version: [ghc_8_10_7, ghc_9_0_2, ghc_9_2_7, ghc_9_4_5, ghc_9_6_2]
enable-bzlmod: [false]
include:
- os: ubuntu-latest
Expand All @@ -31,6 +31,9 @@ jobs:
- os: ubuntu-latest
ghc-version: ghc_9_4_5
enable-bzlmod: true
- os: ubuntu-latest
ghc-version: ghc_9_6_2
enable-bzlmod: true
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion cabalscan/src/Cabal/Cabal_9_4.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{-#LANGUAGE CPP #-}

#if __GLASGOW_HASKELL__ == 904
#if __GLASGOW_HASKELL__ >= 904

module Cabal.Cabal_9_4(module Cabal, depLibraries, hsSourceDirs)

Expand Down
6 changes: 5 additions & 1 deletion cabalscan/src/CabalScan/RuleGenerator.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,14 @@ import qualified Cabal.Cabal_9_0 as Cabal

import qualified Cabal.Cabal_9_2 as Cabal

#else
#elif __GLASGOW_HASKELL__ >= 904

import qualified Cabal.Cabal_9_4 as Cabal

#else

#error GHC version __GLASGOW_HASKELL__ not supported

#endif

generateRulesForCabalFile :: FilePath -> IO [RuleInfo]
Expand Down
Loading