mirror of
https://github.com/simonmichael/hledger.git
synced 2024-09-19 10:17:35 +03:00
stack: bump stack & shake to latest nightly
This commit is contained in:
parent
4a75acedf0
commit
07629c803a
30
Shake.hs
30
Shake.hs
@ -1,5 +1,5 @@
|
|||||||
#!/usr/bin/env stack
|
#!/usr/bin/env stack
|
||||||
{- stack script --resolver nightly-2022-03-03 --compile
|
{- stack script --resolver nightly-2022-04-14 --compile
|
||||||
--extra-include-dirs /Library/Developer/CommandLineTools/SDKs/MacOSX12.1.sdk/usr/include/ffi
|
--extra-include-dirs /Library/Developer/CommandLineTools/SDKs/MacOSX12.1.sdk/usr/include/ffi
|
||||||
--package base-prelude
|
--package base-prelude
|
||||||
--package directory
|
--package directory
|
||||||
@ -276,22 +276,22 @@ main = do
|
|||||||
-- (used by "cabalfiles" and "setversion")
|
-- (used by "cabalfiles" and "setversion")
|
||||||
let gencabalfiles = do
|
let gencabalfiles = do
|
||||||
|
|
||||||
-- Update cabal files with stack build.
|
-- Update cabal files with stack build.
|
||||||
-- stack 1.7+ no longer updates cabal files with --dry-run, we must do a full build.
|
-- stack 1.7+ no longer updates cabal files with --dry-run, we must do a full build.
|
||||||
-- stack can return zero exit code while failing to update cabal files so
|
-- stack can return zero exit code while failing to update cabal files so
|
||||||
-- we need to check for the error message (specifically) on stderr.
|
-- we need to check for the error message (specifically) on stderr.
|
||||||
-- out <- fromStdouterr <$> -- (getting both stdout and stderr here just as an example)
|
-- out <- fromStdouterr <$> -- (getting both stdout and stderr here just as an example)
|
||||||
-- (cmd (EchoStdout True) (EchoStderr True) Shell "stack build" :: Action (Stdouterr String))
|
-- (cmd (EchoStdout True) (EchoStderr True) Shell "stack build" :: Action (Stdouterr String))
|
||||||
-- when ("was generated with a newer version of hpack" `isInfixOf` out) $
|
-- when ("was generated with a newer version of hpack" `isInfixOf` out) $
|
||||||
-- liftIO $ putStr out >> exitFailure
|
-- liftIO $ putStr out >> exitFailure
|
||||||
|
|
||||||
-- Or update them with hpack directly.
|
-- Or update them with hpack directly.
|
||||||
-- It should be the same hpack version that's in current stack, to avoid commit conflicts.
|
-- It should be the same hpack version that's in current stack, to avoid commit conflicts.
|
||||||
forM_ pkgdirs $ \d -> cmd_ (Cwd d) Shell "hpack --no-hash"
|
forM_ pkgdirs $ \d -> cmd_ (Cwd d) Shell "hpack --no-hash"
|
||||||
|
|
||||||
when commit $ do
|
when commit $ do
|
||||||
let msg = ";cabal: update cabal files"
|
let msg = ";cabal: update cabal files"
|
||||||
cmd Shell gitcommit ("-m '"++msg++"' --") cabalfiles
|
cmd Shell gitcommit ("-m '"++msg++"' --") cabalfiles
|
||||||
|
|
||||||
-- Update version strings in most "source" files to match what's in PKG/.version.
|
-- Update version strings in most "source" files to match what's in PKG/.version.
|
||||||
-- If a version number is provided as first argument, save that in PKG/.version files first.
|
-- If a version number is provided as first argument, save that in PKG/.version files first.
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# stack build plan using GHC 9.2.2
|
# stack build plan using GHC 9.2.2
|
||||||
|
|
||||||
resolver: nightly-2022-03-25
|
resolver: nightly-2022-04-14
|
||||||
|
|
||||||
packages:
|
packages:
|
||||||
- hledger-lib
|
- hledger-lib
|
||||||
|
Loading…
Reference in New Issue
Block a user