From 4ad3c00e40672fc87230b33019c0530c08fe1bc1 Mon Sep 17 00:00:00 2001 From: Vincent Hanquez Date: Tue, 15 Jul 2014 14:11:44 +0100 Subject: [PATCH 1/8] add travis-ci --- .travis.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..fa87dbd --- /dev/null +++ b/.travis.yml @@ -0,0 +1,35 @@ +env: + - GHCVER=6.12.3 + - GHCVER=7.0.1 + - GHCVER=7.0.2 + - GHCVER=7.0.3 + - GHCVER=7.0.4 + - GHCVER=7.2.1 + - GHCVER=7.2.2 + - GHCVER=7.4.1 + - GHCVER=7.4.2 + - GHCVER=7.6.1 + - GHCVER=7.6.2 + - GHCVER=7.6.3 + +before_install: + - sudo add-apt-repository -y ppa:hvr/ghc + - sudo apt-get update + - sudo apt-get install cabal-install-1.18 ghc-$GHCVER + - export PATH=/opt/ghc/$GHCVER/bin:$PATH + +install: + - cabal-1.18 update + - if [ "$GHCVER" = "6.12.3" ]; then + cabal-1.18 install --only-dependencies; + cabal-1.18 install 'QuickCheck==2.6.*'; + else + cabal-1.18 install --only-dependencies --enable-tests; + fi + +script: + - cabal-1.18 configure --enable-tests -v2 + - cabal-1.18 build + - cabal-1.18 test + - cabal-1.18 check + - cabal-1.18 sdist From e715f3730898e6c883c651a8c347df94ea97d489 Mon Sep 17 00:00:00 2001 From: Vincent Hanquez Date: Tue, 15 Jul 2014 14:12:31 +0100 Subject: [PATCH 2/8] add status icons. --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 20dcacd..26208c6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,10 @@ cryptonite ========== +[![Build Status](https://travis-ci.org/vincenthz/cryptonite.png?branch=master)](https://travis-ci.org/vincenthz/cryptonite) +[![BSD](http://b.repl.ca/v1/license-BSD-blue.png)](http://en.wikipedia.org/wiki/BSD_licenses) +[![Haskell](http://b.repl.ca/v1/language-haskell-lightgrey.png)](http://haskell.org) + Cryptonite is a haskell repository of cryptographic primitives. Each crypto algorithm have specificities, that are hard to wrap in common APIs and types, so instead of trying to provide a common ground for algorithms that wouldn't From be64f769bffe4e6c2c983fb125077e2c695e9f28 Mon Sep 17 00:00:00 2001 From: Vincent Hanquez Date: Tue, 15 Jul 2014 14:18:45 +0100 Subject: [PATCH 3/8] add a bug-reports url --- cryptonite.cabal | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cryptonite.cabal b/cryptonite.cabal index a46d315..1795c56 100644 --- a/cryptonite.cabal +++ b/cryptonite.cabal @@ -11,6 +11,8 @@ Category: Cryptography Stability: experimental Build-Type: Simple Homepage: https://github.com/vincenthz/cryptonite +Bug-reports: https://github.com/vincenthz/cryptonite/issues + Cabal-Version: >=1.10 extra-source-files: README.md cbits/*.h From e3a1fc177aca5242d20faf63d1b365434ae7c627 Mon Sep 17 00:00:00 2001 From: Vincent Hanquez Date: Tue, 15 Jul 2014 14:48:16 +0100 Subject: [PATCH 4/8] remove some ghc versions --- .travis.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index fa87dbd..a994194 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,15 @@ env: - GHCVER=6.12.3 - - GHCVER=7.0.1 - - GHCVER=7.0.2 - - GHCVER=7.0.3 - GHCVER=7.0.4 - - GHCVER=7.2.1 - GHCVER=7.2.2 - - GHCVER=7.4.1 - GHCVER=7.4.2 - - GHCVER=7.6.1 - - GHCVER=7.6.2 - GHCVER=7.6.3 + - GHCVER=7.8.2 + - GHCVER=head + +matrix: + allow_failures: + - env: GHCVER=head before_install: - sudo add-apt-repository -y ppa:hvr/ghc From 0a5d746cad4dbe2822993c75d3aece733a7fb494 Mon Sep 17 00:00:00 2001 From: Vincent Hanquez Date: Tue, 15 Jul 2014 14:48:27 +0100 Subject: [PATCH 5/8] remove mtl as dependency --- cryptonite.cabal | 1 - 1 file changed, 1 deletion(-) diff --git a/cryptonite.cabal b/cryptonite.cabal index 1795c56..ff95cf6 100644 --- a/cryptonite.cabal +++ b/cryptonite.cabal @@ -44,7 +44,6 @@ Test-Suite test-cryptonite Build-Depends: base >= 3 && < 5 , bytestring , byteable - , mtl , tasty , tasty-quickcheck , tasty-hunit From fc2461c2b1ac52ab1709022c0c15c56b7a3fe218 Mon Sep 17 00:00:00 2001 From: Vincent Hanquez Date: Tue, 15 Jul 2014 14:56:57 +0100 Subject: [PATCH 6/8] remove 6.12 --- .travis.yml | 8 +------- cryptonite.cabal | 1 - 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index a994194..8a9576f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ env: - - GHCVER=6.12.3 - GHCVER=7.0.4 - GHCVER=7.2.2 - GHCVER=7.4.2 @@ -19,12 +18,7 @@ before_install: install: - cabal-1.18 update - - if [ "$GHCVER" = "6.12.3" ]; then - cabal-1.18 install --only-dependencies; - cabal-1.18 install 'QuickCheck==2.6.*'; - else - cabal-1.18 install --only-dependencies --enable-tests; - fi + - cabal-1.18 install --only-dependencies --enable-tests; script: - cabal-1.18 configure --enable-tests -v2 diff --git a/cryptonite.cabal b/cryptonite.cabal index ff95cf6..5b3df9c 100644 --- a/cryptonite.cabal +++ b/cryptonite.cabal @@ -12,7 +12,6 @@ Stability: experimental Build-Type: Simple Homepage: https://github.com/vincenthz/cryptonite Bug-reports: https://github.com/vincenthz/cryptonite/issues - Cabal-Version: >=1.10 extra-source-files: README.md cbits/*.h From 3cfac3f34e6d5eee103a047cb920504381162852 Mon Sep 17 00:00:00 2001 From: Vincent Hanquez Date: Tue, 15 Jul 2014 15:26:35 +0100 Subject: [PATCH 7/8] add instances of IsString for ghc 7.4.x --- tests/KATSalsa.hs | 1 + tests/Tests.hs | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/KATSalsa.hs b/tests/KATSalsa.hs index 101de7a..4670165 100644 --- a/tests/KATSalsa.hs +++ b/tests/KATSalsa.hs @@ -2,6 +2,7 @@ module KATSalsa (vectors) where import qualified Data.ByteString as B +import Data.ByteString.Char8 () key :: B.ByteString key = "\xEA\xEB\xEC\xED\xEE\xEF\xF0\xF1\xF2\xF3\xF4\xF5\xF6\xF7\xF8\xF9\xFA\xFB\xFC\xFD\xFE\xFF\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09" diff --git a/tests/Tests.hs b/tests/Tests.hs index 0e3bfd3..ff3b52d 100644 --- a/tests/Tests.hs +++ b/tests/Tests.hs @@ -5,6 +5,7 @@ import Control.Applicative import Data.Byteable import Data.ByteString (ByteString) import qualified Data.ByteString as B +import Data.ByteString.Char8 () import Test.Tasty import Test.Tasty.QuickCheck import Test.Tasty.HUnit From bfebb195bb9961de343b1c0ab550ae5cd2b7f4d2 Mon Sep 17 00:00:00 2001 From: Vincent Hanquez Date: Tue, 15 Jul 2014 15:43:05 +0100 Subject: [PATCH 8/8] remove 7.0 and 7.2 --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8a9576f..c9cff9a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,4 @@ env: - - GHCVER=7.0.4 - - GHCVER=7.2.2 - GHCVER=7.4.2 - GHCVER=7.6.3 - GHCVER=7.8.2