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

Add support for GHC 9.6 and GHC 9.8 #130

Merged
merged 11 commits into from
Nov 5, 2024
Merged

Add support for GHC 9.6 and GHC 9.8 #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f366a9e
New ghc-events from 9.4 should also work
hellwolf Apr 23, 2023
5932ca1
Add 9.4.4 to the build array
hellwolf Apr 23, 2023
7635c5a
use cabal 3.8 in ci.yml
hellwolf Apr 23, 2023
722c0f7
Update ci.yml
hellwolf Apr 23, 2023
1526dc6
Update ci.yml
hellwolf Apr 23, 2023
a882d80
Fix ubuntu build
hellwolf Apr 23, 2023
12819ab
Relax bounds
TeofilC Mar 1, 2024
860af3d
Add 9.6,9.8 to CI
TeofilC Mar 1, 2024
8846508
Adapt to lack of Control.Monad re-exports from Control.Monad.Reader i…
TeofilC Mar 1, 2024
7f09ab5
Install cairo on mac
TeofilC Oct 30, 2024
dc2e3e3
haskell/actions/setup -> haskell-actions/setup
TeofilC Oct 30, 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
18 changes: 12 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,15 @@ jobs:
strategy:
matrix:
ghc:
- "9.8.2"
- "9.6.4"
- "9.4.8"
- "9.2.2"
- "9.0.2"
- "8.10.7"
- "8.8.4"
cabal:
- "3.6"
- "3.10.1.0"
os:
- ubuntu-latest
- macOS-latest
Expand All @@ -23,7 +26,7 @@ jobs:
- uses: actions/checkout@v2
- name: Set up Haskell
id: setup-haskell-cabal
uses: haskell/actions/setup@v1
uses: haskell-actions/setup@v2
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: ${{ matrix.cabal }}
Expand All @@ -34,10 +37,10 @@ jobs:
key: ${{ runner.os }}-${{ matrix.ghc }}-cabal
- name: Install system dependencies (Linux)
if: runner.os == 'Linux'
run: sudo apt-get install libgtk2.0-dev
run: sudo apt-get update && sudo apt-get install libgtk2.0-dev
- name: Install system dependencies (macOS)
if: runner.os == 'macOS'
run: brew install gtk+ pkg-config
run: brew install cairo gtk+ pkg-config
- name: Set extra cabal build options (macOS)
if: runner.os == 'macOS'
run: echo "CABAL_BUILD_OPTIONS=--constraint='gtk +have-quartz-gtk'" >> $GITHUB_ENV
Expand Down Expand Up @@ -98,20 +101,23 @@ jobs:
strategy:
matrix:
ghc:
- "9.8.2"
- "9.6.4"
- "9.4.8"
- "9.2.2"
- "9.0.2"
- "8.10.7"
- "8.8.4"
cabal:
- "3.6"
- "3.10.1.0"
os:
- windows-latest
fail-fast: false
steps:
- uses: actions/checkout@v2
- name: Set up Haskell
id: setup-haskell-cabal
uses: haskell/actions/setup@v1
uses: haskell-actions/setup@v2
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: ${{ matrix.cabal }}
Expand Down
1 change: 1 addition & 0 deletions GUI/EventsView.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import GHC.RTS.Events
import Graphics.UI.Gtk
import qualified GUI.GtkExtras as GtkExt

import Control.Monad
import Control.Monad.Reader
import Data.Array
import Data.Monoid
Expand Down
16 changes: 8 additions & 8 deletions threadscope.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,16 @@ Executable threadscope
pango < 0.14,
binary < 0.11,
array < 0.6,
mtl < 2.3,
filepath < 1.5,
ghc-events >= 0.13 && < 0.19,
containers >= 0.2 && < 0.7,
mtl < 2.4,
filepath < 1.6,
ghc-events >= 0.13 && < 0.20,
containers >= 0.2 && < 0.8,
deepseq >= 1.1,
text < 2.1,
text < 2.2,
time >= 1.1 && < 1.13,
bytestring < 0.12,
bytestring < 0.13,
file-embed < 0.1,
template-haskell < 2.20,
template-haskell < 2.22,
temporary >= 1.1 && < 1.4

include-dirs: include
Expand Down Expand Up @@ -116,6 +116,6 @@ Executable threadscope
ghc-options: -fno-warn-unused-matches

if !os(windows)
build-depends: unix >= 2.3 && < 2.8
build-depends: unix >= 2.3 && < 2.9

default-language: Haskell2010
Loading