diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 81a2d65..8a73089 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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 }} @@ -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 @@ -98,12 +101,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: - windows-latest fail-fast: false @@ -111,7 +117,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 }} diff --git a/GUI/EventsView.hs b/GUI/EventsView.hs index 6f79cbb..74d56d9 100644 --- a/GUI/EventsView.hs +++ b/GUI/EventsView.hs @@ -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 diff --git a/threadscope.cabal b/threadscope.cabal index ef73429..8deb1b9 100644 --- a/threadscope.cabal +++ b/threadscope.cabal @@ -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 @@ -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