hkgr 0.4.3.1 → 0.4.3.2

raw patch · 4 files changed

+25/−9 lines, 4 files

Files

README.md +12/−5
data/template.cabal.tmpl +3/−3
hkgr.cabal +1/−1
src/Main.hs +9/−0

README.md view

@@ -69,10 +69,12 @@  ## Help -```shellsession-$ hkgr --version-0.4.3-$ hkgr --help+`$ hkgr --version`+```+0.4.3.2+```+`$ hkgr --help`+``` Hackage Release tool  Usage: hkgr [--version] COMMAND@@ -118,7 +120,7 @@ the tag and dist tarball.  One should not be able to `tagdist` on an already published-(ie released) version made with hkgr, before the version is bumped.+(ie released) version made with hkgr, until the version is bumped.  If sdist fails for some reason then hkgr tries to reset the tag. @@ -167,3 +169,8 @@  ## Requirements hkgr uses `cabal-install` >=2, `git`, and also `hlint` if available.++## Contribute+`hkgr` is distributed under GPL version 3 or later.++Reports and contributions are welcome at <https://github.com/juhp/hkgr>.

data/template.cabal.tmpl view

@@ -15,11 +15,11 @@ build-type:          Simple --  extra-doc-files:     README.md --                       ChangeLog.md--- tested-with:         GHC == 8.8.4---                       || == 8.10.7+-- tested-with:         GHC == 8.10.7 --                       || == 9.0.2 --                       || == 9.2.8---                       || == 9.4.5+--                       || == 9.4.7+--                       || == 9.6.3  source-repository head   type:                git

hkgr.cabal view

@@ -1,6 +1,6 @@ cabal-version:       2.0 name:                hkgr-version:             0.4.3.1+version:             0.4.3.2 synopsis:            Simple Hackage release workflow for package maintainers description:             Hkgr (Hackager) is a tool to help make new releases of

src/Main.hs view

@@ -222,6 +222,7 @@     let dest = takeDirectory $ cwd </> target     unlessM (doesDirectoryExist dest) $       createDirectoryIfMissing True dest+    addCabalProject     cabal_ "v2-sdist" ["--output-dir=" ++ dest]  showVersionCmd :: IO ()@@ -454,6 +455,13 @@   git_ "branch" ["-M", "main"] --  git_ "push" ["-u", "origin", "main"] +-- pristine cabal sdist/build fail if there's a top cabal.project+addCabalProject :: IO ()+addCabalProject = do+  let cabalproject = "cabal.project"+  unlessM (doesFileExist cabalproject) $+    writeFile cabalproject "packages: .\n"+ pristineBuildCmd :: IO () pristineBuildCmd = do   needProgram "cabal"@@ -466,4 +474,5 @@   withTempDirectory "tmp-build" $ do     cmd_ "tar" ["xf", tarball]     setCurrentDirectory $ showPkgId pkgid+    addCabalProject     cabal_ "build" []