Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mention tarball earlier in sdist #4117

Merged
merged 3 commits into from
Jul 1, 2018
+3 −1
Merged

Mention tarball earlier in sdist #4117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be768d7
mention tarball earlier in sdist
isovector Jun 25, 2018
083dcaa
update changelog
isovector Jul 1, 2018
57244a6
Merge branch 'master' into issue-4112
isovector Jul 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ Behavior changes:
* `stack build` will now announce when sublibraries of a package are being
build, in the same way executables, tests, benchmarks and libraries are
announced
* `stack sdist` will now announce the destination of the generated tarball,
regardless of whether or not it passed the sanity checks
* The `--upgrade-cabal` option to `stack setup` has been
deprecated. This feature no longer works with GHC 8.2 and
later. Furthermore, the reason for this flag originally being
Expand Down
2 changes: 1 addition & 1 deletion src/main/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,8 +776,8 @@ sdistCmd sdistOpts go =
tarPath <- (distDir </>) <$> parseRelFile tarName
ensureDir (parent tarPath)
liftIO $ L.writeFile (toFilePath tarPath) tarBytes
checkSDistTarball sdistOpts tarPath
prettyInfoL [flow "Wrote sdist tarball to", display tarPath]
checkSDistTarball sdistOpts tarPath
forM_ (sdoptsTarPath sdistOpts) $ copyTarToTarPath tarPath tarName
when (sdoptsSign sdistOpts) (void $ Sig.sign (sdoptsSignServerUrl sdistOpts) tarPath)
where
Expand Down