Skip to content

Commit

Permalink
up
Browse files Browse the repository at this point in the history
  • Loading branch information
thautwarm committed Nov 27, 2020
1 parent cddbf29 commit 21e5543
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 23 deletions.
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@ cache:
- "$HOME/.ghc"

python: 3.7
env: BUILD=stack ARGS="--resolver lts-13.15"
env: BUILD=stack ARGS="--resolver lts-14.20"
jobs:
include:
- os: linux
compiler: ": #stack 8.6.4"
compiler: ": #stack 8.6.5"

- os: osx
osx_image: xcode12
compiler: ": #stack 8.6.4 osx"
compiler: ": #stack 8.6.5 osx"

- os: osx
osx_image: xcode11
compiler: ": #stack 8.6.4 osx"
compiler: ": #stack 8.6.5 osx"

- os: osx
osx_image: xcode10
compiler: ": #stack 8.6.4 osx"
compiler: ": #stack 8.6.5 osx"


before_install:
Expand Down Expand Up @@ -68,7 +68,7 @@ deploy:
provider: releases
api_key: $GH_TK
file: $ZIP_FILE
draft: true
skip_cleanup: true
on:
branch: cfg

Expand Down
13 changes: 2 additions & 11 deletions RBNF.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cabal-version: 1.12
--
-- see: https://github.com/sol/hpack
--
-- hash: 8ad26b096f0368f3ec44163735c43b0a0cc96dc62f05faa301e0ecfcf3df81d1
-- hash: fe22c05694f04752a14d7673c350444557be150f2da96f35a49ee2aae035e08a

name: RBNF
version: 0.1.0.0
Expand Down Expand Up @@ -53,16 +53,13 @@ library
default-extensions: ViewPatterns DeriveGeneric DeriveFunctor DeriveTraversable LambdaCase TemplateHaskell DuplicateRecordFields StandaloneDeriving ExistentialQuantification MultiParamTypeClasses NamedFieldPuns PartialTypeSignatures FlexibleInstances
ghc-options: -fno-warn-partial-type-signatures -Wall -Wno-name-shadowing
build-depends:
aeson
, base >=4.7 && <5
base >=4.7 && <5
, containers
, lens
, mtl
, parsec
, prettyprinter
, text
, transformers
, utf8-string
, vector
if os(darwin)
ghc-options: -Wall -O2
Expand All @@ -83,16 +80,13 @@ executable fff-lex
ghc-options: -fno-warn-partial-type-signatures -Wall -Wno-name-shadowing -threaded -rtsopts -with-rtsopts=-N
build-depends:
RBNF
, aeson
, base >=4.7 && <5
, containers
, lens
, mtl
, parsec
, prettyprinter
, text
, transformers
, utf8-string
, vector
if os(darwin)
ghc-options: -Wall -O2
Expand All @@ -113,16 +107,13 @@ executable fff-pgen
ghc-options: -fno-warn-partial-type-signatures -Wall -Wno-name-shadowing -threaded -rtsopts -with-rtsopts=-N
build-depends:
RBNF
, aeson
, base >=4.7 && <5
, containers
, lens
, mtl
, parsec
, prettyprinter
, text
, transformers
, utf8-string
, vector
if os(darwin)
ghc-options: -Wall -O2
Expand Down
10 changes: 9 additions & 1 deletion build-release.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
[ -d hsbin-dist ] || mkdir hsbin-dist

if [ -f python ]
then
PY=python
else
PY=python3
fi

cp `stack path --dist-dir`/build/fff-lex/fff-lex hsbin-dist/
cp `stack path --dist-dir`/build/fff-pgen/fff-pgen hsbin-dist/
export ZIP_FILE="fff-`python release-env.py plat`-`python version.py`.zip"
export ZIP_FILE="fff-`$PY release-env.py plat`-`$PY version.py`.zip"
zip -r $ZIP_FILE hsbin-dist/*
6 changes: 3 additions & 3 deletions package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ dependencies:
- containers
- lens
- vector
- aeson
- transformers
- prettyprinter
- utf8-string
- parsec
# - utf8-string
# - parsec
# - aeson
library:
source-dirs:
- src
Expand Down
2 changes: 1 addition & 1 deletion src/RBNF/BackEnds/Python.hs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import RBNF.IRs.MarisaLibrary
import RBNF.Name
import RBNF.Utils
import Control.Monad.State
import Codec.Binary.UTF8.String as UTF8
-- import Codec.Binary.UTF8.String as UTF8

import qualified Data.Text as T
import qualified Data.Set as S
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
flags: {}
packages:
- .
resolver: lts-13.15
resolver: lts-14.20

0 comments on commit 21e5543

Please sign in to comment.