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

Build with GHC 9.6.3 #163

Merged
merged 5 commits into from
Nov 5, 2023
+9 −7
Merged

Build with GHC 9.6.3 #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0722d33
Build with GHC 9.6.2
kpadmasola Oct 14, 2023
847a744
Cleanup MonadFix imports
luc-tielen Oct 14, 2023
3f1916f
bump up upload-artifact github action version to v3
kpadmasola Nov 5, 2023
2a07ea9
Merge branch 'ghc-9.6.2' of github.com-personal:placidex/eclair-lang …
kpadmasola Nov 5, 2023
ad04a9a
Update Dockerfile for ghc-9.6.3
kpadmasola Nov 5, 2023
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: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

- name: Upload logs
if: ${{ always() }}
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: eclair-lang-${{matrix.os}}.log
path: eclair-lang-${{matrix.os}}.log
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ RUN echo 'tzdata tzdata/Areas select Europe' | debconf-set-selections \
&& ln -s wasm-ld-$LLVM_VERSION wasm-ld \
&& cd - \
&& pip install lit==14.0.6 \
# install ghcup, ghc-9.4.4 and cabal-3.8.1.0
# install ghcup, ghc-9.6.3 and cabal-3.10.1.0
&& curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | \
BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_GHC_VERSION=9.4.4 BOOTSTRAP_HASKELL_CABAL_VERSION=3.8.1.0 \
BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_GHC_VERSION=9.6.3 BOOTSTRAP_HASKELL_CABAL_VERSION=3.10.1.0 \
BOOTSTRAP_HASKELL_INSTALL_STACK=1 BOOTSTRAP_HASKELL_INSTALL_HLS=1 BOOTSTRAP_HASKELL_ADJUST_BASHRC=P sh \
&& source /root/.ghcup/env \
&& cabal install cabal-fmt \
Expand Down
4 changes: 2 additions & 2 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ packages: .
source-repository-package
type: git
location: https://github.com/luc-tielen/llvm-codegen.git
tag: 497c7c0ffad5f3e4b6f4e74550a477e75b0beb23
tag: 83b04cb576208ea74ddd62016e4fa03f0df138ac

source-repository-package
type: git
location: https://github.com/luc-tielen/souffle-haskell.git
tag: bcd7e3c058c9036d8495cf114520663917b7ac81
tag: e441c84f1d64890e31c92fbb278c074ae8bcaff5

source-repository-package
type: git
Expand Down
4 changes: 2 additions & 2 deletions lib/Eclair/Parser.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,9 +352,9 @@ betweenParens =
-- In case of error, keeps parsing up to and including 'endChar'
withRecovery :: Char -> Parser a -> Parser (Maybe a)
withRecovery endChar p =
P.withRecovery handleError $ map Just p
P.withRecovery handleErr $ map Just p
where
handleError err = do
handleErr err = do
luc-tielen marked this conversation as resolved.
Show resolved Hide resolved
P.registerParseError err
_ <- P.takeWhileP Nothing (/= endChar)
_ <- P.char endChar
Expand Down
2 changes: 2 additions & 0 deletions lib/Prelude.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ module Prelude
, module Control.Monad.Writer.Strict
, module Control.Monad.RWS.Strict
, module Control.Monad.Except
, module Control.Monad.Fix
, module Control.Category
, module Control.Comonad
, module Data.Functor.Foldable
Expand All @@ -30,6 +31,7 @@ import Control.Concurrent.MVar (modifyMVar_)
import Control.Monad.Writer.Strict hiding (pass)
import Control.Monad.RWS.Strict hiding (pass)
import Control.Monad.Except
import Control.Monad.Fix
import Data.Functor.Foldable hiding (fold, unfold, refold, hoist)
import Data.Functor.Foldable.TH
import GHC.TypeLits (KnownSymbol, Symbol, symbolVal)
Expand Down
Loading