@@ -44,9 +44,6 @@ data ObRunState
4444doubleQuotes :: (IsString a, Semigroup a) => a -> a
4545doubleQuotes s = "\"" <> s <> "\""
4646
47−routeFile :: IsString a => a
48−routeFile = "config/common/route"
49−
5047commit :: Text -> Sh ()
5148commit msg = void $ run "git"
5249 [ "commit"
@@ -151,16 +148,16 @@ main = do
151148 it "can build ghc.backend" $ inTmpObInit $ \_ -> nixBuild ["-A", "ghc.backend"]
152149 it "can build ghcjs.frontend" $ inTmpObInit $ \_ -> nixBuild ["-A", "ghcjs.frontend"]
153150
154− -- if os == "darwin"
155− -- then it "can build ios" $ inTmpObInit $ \_ -> nixBuild ["-A", "ios.frontend"]
156− -- else it "can build android after accepting license" $ inTmpObInit $ \dir -> do
157− -- let defaultNixPath = dir </> ("default.nix" :: Shelly.FilePath)
158− -- writefile defaultNixPath
159− -- =<< T.replace
160− -- "# config.android_sdk.accept_license = false;"
161− -- "config.android_sdk.accept_license = true;"
162− -- <$> readfile defaultNixPath
163− -- nixBuild ["-A", "android.frontend"]
151+ if os == "darwin"
152+ then it "can build ios" $ inTmpObInit $ \_ -> nixBuild ["-A", "ios.frontend"]
153+ else it "can build android after accepting license" $ inTmpObInit $ \dir -> do
154+ let defaultNixPath = dir </> ("default.nix" :: Shelly.FilePath)
155+ writefile defaultNixPath
156+ =<< T.replace
157+ "# config.android_sdk.accept_license = false;"
158+ "config.android_sdk.accept_license = true;"
159+ <$> readfile defaultNixPath
160+ nixBuild ["-A", "android.frontend"]
164161
165162 forM_ ["ghc", "ghcjs"] $ \compiler -> do
166163 let
@@ -238,7 +235,7 @@ main = do
238235testObRunInDir :: Socket.PortNumber -> Socket.PortNumber -> Maybe Shelly.FilePath -> HTTP.Manager -> Sh ()
239236testObRunInDir p0 p1 mdir httpManager = handle_sh (\case ExitSuccess -> pure (); e -> throw e) $ do
240237 let uri p = "http://localhost:" <> T.pack (show p) <> "/" -- trailing slash required for comparison
241− writefile routeFile $ uri p0
238+ writefile "config/common/route" $ uri p0
242239 maybe id chdir mdir $ runHandle "ob" ["run"] $ \stdout -> do
243240 firstUri <- handleObRunStdout httpManager stdout
244241 let newUri = uri p1
@@ -283,10 +280,10 @@ hGetLineSkipBlanks h = liftIO $ fix $ \loop -> T.hGetLine h >>= \case
283280-- | Alters the route file and waits for `ob run` to reload
284281alterRouteTo :: Text -> Handle -> Sh ()
285282alterRouteTo uri stdout = do
286− writefile routeFile uri
283+ writefile "config/common/route" uri
287284 hGetLineSkipBlanks stdout >>= \t -> when (t /= "Reloading...") $ errorExit $
288285 "Reloading failed: " <> T.pack (show t)
289− hGetLineSkipBlanks stdout >>= \t -> when (t /= " " <> routeFile) $ errorExit $
286+ hGetLineSkipBlanks stdout >>= \t -> when (t /= " config/common/route") $ errorExit $
290287 "Reloading failed: " <> T.pack (show t)
291288 hGetLineSkipBlanks stdout >>= \t -> when (t /= "Interrupted.") $ errorExit $
292289 "Reloading failed: " <> T.pack (show t)