Another attempt to fix integration tests

borsboom · borsboom · commit b753c358f994 · 2017-01-06T10:21:43.000-08:00
diff --git a/etc/scripts/release.hs b/etc/scripts/release.hs
@@ -155,7 +155,7 @@ rules global@Global{..} args = do
         when (not gAllowDirty && not (null (trim dirty))) $
             error ("Working tree is dirty.  Use --" ++ allowDirtyOptName ++ " option to continue anyway.")
         withTempDir $ \tmpDir -> do
-            let cmd0 c = cmd (releaseBinDir </> binaryName </> stackExeFileName)
+            let cmd0 c = cmd (gProjectRoot </> releaseBinDir </> binaryName </> stackExeFileName)
                     (stackArgs global)
                     ["--local-bin-path=" ++ tmpDir]
                     c

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ rules global@Global{..} args = do`
`155`	`155`	`when (not gAllowDirty && not (null (trim dirty))) $`
`156`	`156`	`error ("Working tree is dirty. Use --" ++ allowDirtyOptName ++ " option to continue anyway.")`
`157`	`157`	`withTempDir $ \tmpDir -> do`
`158`		`- let cmd0 c = cmd (releaseBinDir </> binaryName </> stackExeFileName)`
	`158`	`+ let cmd0 c = cmd (gProjectRoot </> releaseBinDir </> binaryName </> stackExeFileName)`
`159`	`159`	`(stackArgs global)`
`160`	`160`	`["--local-bin-path=" ++ tmpDir]`
`161`	`161`	`c`