Use CircleCI 2.0 again

.circle/config.yml

@@ -0,0 +1,34 @@
+defaults: &defaults
+  docker:
+    - image: typelead/eta:latest
+
+version: 2.0
+jobs:
+  test:
+    <<: *defaults
+    steps:
+      - checkout
+
+      - restore_cache:
+          key: v1200-etlas-cache-
+
+      - run: etlas update
+      - run: etlas install --dependencies-only
+      - run: etlas run
+
+      - save_cache:
+          key: v1200-etlas-cache-{{ epoch }}
+          paths:
+            - "~/.etlas/config"
+            - "~/.etlas/packages"
+            - "~/.etlas/patches"
+            - "~/.etlas/tools"
+
+workflows:
+  version: 2
+  full_cycle:
+    jobs:
+      - test
+      - tests:
+          requires:
+            - test

.gitignore

@@ -0,0 +1 @@
+dist

eta-hackage.cabal

@@ -0,0 +1,17 @@
+name:                eta-hackage
+version:             0.1.0.0
+author:              Rahul Muttineni
+maintainer:          rahulmutt@gmail.com
+build-type:          Simple
+cabal-version:       >=1.10
+
+executable eta-hackage
+  main-is:             test/Main.hs
+  build-depends:       base >=4.8 && <4.9
+                     , aeson
+                     , bytestring
+                     , directory
+                     , filepath
+                     , text
+                     , process
+  default-language:    Haskell2010

test/Test.hs → test/Main.hs

@@ -1,24 +1,6 @@
-#!/usr/bin/env stack
-{- stack
-     --resolver lts-6.6
-     --install-ghc
-     runghc
-     --package turtle-1.3.0
-     --package text
-     --package aeson
-     --package bytestring
-     --package directory
-     --package filepath
-     --package optparse-applicative-0.13.2.0
--}
-
 {-# LANGUAGE OverloadedStrings #-}
 module Main where
 
-import Turtle.Shell
-import Turtle.Line
-import Turtle.Prelude hiding (die)
-
 import Data.Aeson
 import Data.Text (Text)
 import qualified Data.Text as T
@@ -33,6 +15,7 @@ import Control.Monad
 import Data.String
 import GHC.IO.Exception (ExitCode(..))
 import System.Exit (die)
+import System.Process
 
 data Packages = Packages {
       patched :: [Text],
@@ -104,19 +87,18 @@ buildPackage pkg = do
   putStrLn dashes
   putStrLn outString
   putStrLn dashes
-  sh $ procExitOnError "etlas" ["--patches-dir", ".", "install", pkg] empty
+  procExitOnError "etlas" ["--patches-dir", ".", "install", T.unpack pkg]
 
-procExitOnError :: Text -> [Text] -> Shell Line -> Shell ()
-procExitOnError prog args shellm = do
-  exitCode <- proc prog args shellm
+procExitOnError :: String -> [String] -> IO ()
+procExitOnError prog args = do
+  exitCode <- rawSystem prog args
   case exitCode of
-    ExitFailure code -> liftIO $ die ("ExitCode " ++ show code)
+    ExitFailure code -> die ("ExitCode " ++ show code)
     ExitSuccess -> return ()
 
 main :: IO ()
 main = do
-  let vmUpdateCmd = "etlas update"
-  _ <- shell vmUpdateCmd ""
+  _ <- system "etlas update"
   etlasPkgs <- packagesFilePath
   pkg <- parsePackagesFile etlasPkgs
   case pkg of