From e27755cdda49dabf47b3830336dada040e2bb02d Mon Sep 17 00:00:00 2001 From: 1computer1 Date: Tue, 16 Jun 2020 22:38:54 -0400 Subject: [PATCH] move EvalResult to Myriad.Docker --- src/Myriad/Core.hs | 6 ------ src/Myriad/Docker.hs | 9 ++++++++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/Myriad/Core.hs b/src/Myriad/Core.hs index 55b6092..5eae677 100644 --- a/src/Myriad/Core.hs +++ b/src/Myriad/Core.hs @@ -4,7 +4,6 @@ module Myriad.Core ( Language , ContainerName , ImageName - , EvalResult(..) , Env(..) , MyriadT , runMyriadT @@ -49,11 +48,6 @@ data Env = Env , snowflakeGen :: SnowflakeGen } -data EvalResult - = EvalOk BL.ByteString - | EvalTimedOut - | EvalErrored - newtype MyriadT m a = MyriadT { unMyriadT :: ReaderT Env (LoggingT m) a } deriving newtype ( Functor diff --git a/src/Myriad/Docker.hs b/src/Myriad/Docker.hs index c92f31b..9e9d3bb 100644 --- a/src/Myriad/Docker.hs +++ b/src/Myriad/Docker.hs @@ -11,9 +11,10 @@ module Myriad.Docker import Control.Monad.Reader +import qualified Data.ByteString.Lazy as BL import qualified Data.Map.Strict as M import Data.Snowflake -import Data.String.Conversions +import Data.String.Conversions import Control.Concurrent.Async.Lifted import Control.Concurrent.Lifted (fork, threadDelay) @@ -28,6 +29,12 @@ import Myriad.Core type Myriad = MyriadT IO +data EvalResult + = EvalOk BL.ByteString + | EvalTimedOut + | EvalErrored + deriving (Show) + buildImage :: Language -> Myriad () buildImage lang@Language { name, concurrent } = do Env { config = Config { prepareContainers }, languagesDir } <- ask