Skip to content

Commit

Permalink
Remove debugging, no need for extra temp dir
Browse files Browse the repository at this point in the history
  • Loading branch information
snoyberg committed Apr 22, 2020
1 parent af69b4b commit 82b5f66
Showing 1 changed file with 13 additions and 19 deletions.
32 changes: 13 additions & 19 deletions etc/scripts/release.hs
Original file line number Diff line number Diff line change
Expand Up @@ -200,25 +200,19 @@ rules global@Global{..} args = do
Stdout dirty <- cmd "git status --porcelain"
when (not gAllowDirty && not (null (trim dirty))) $
error ("Working tree is dirty. Use --" ++ allowDirtyOptName ++ " option to continue anyway.")
withTempDir $ \tmpDir -> do
() <- cmd
[gProjectRoot </> releaseBinDir </> binaryName </> stackExeFileName]
(stackArgs global)
["--local-bin-path", tmpDir]
["install"]
gBuildArgs
integrationTestFlagArgs
["--pedantic", "--no-haddock-deps", "--test"]
["--haddock" | gTestHaddocks]
["stack"]
liftIO $ System.Directory.getDirectoryContents tmpDir >>= \x -> print ("tmpDir", tmpDir, x)
() <- cmd ["find", tmpDir]
() <- cmd ["find", gProjectRoot </> releaseBinDir]
() <- cmd
[gProjectRoot </> releaseBinDir </> binaryName </> stackExeFileName]
["exec"]
[gProjectRoot </> releaseBinDir </> binaryName </> "stack-integration-test"]
return ()
() <- cmd
[gProjectRoot </> releaseBinDir </> binaryName </> stackExeFileName]
(stackArgs global)
["build"]
gBuildArgs
integrationTestFlagArgs
["--pedantic", "--no-haddock-deps", "--test"]
["--haddock" | gTestHaddocks]
["stack"]
() <- cmd
[gProjectRoot </> releaseBinDir </> binaryName </> stackExeFileName]
["exec"]
[gProjectRoot </> releaseBinDir </> binaryName </> "stack-integration-test"]
copyFileChanged (releaseBinDir </> binaryName </> stackExeFileName) out

unless gUploadOnly $ releaseDir </> binaryPkgZipFileName %> \out -> do
Expand Down

0 comments on commit 82b5f66

Please sign in to comment.