Skip to content

Commit 2ae4def

Browse files
committed
cli: Use separate options for maint and build handlers
1 parent 5d1ffea commit 2ae4def

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

packages/hix/lib/Hix/Options.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ managedOptionsParser = do
352352
context <- Right <$> optional jsonConfigParser
353353
project <- projectOptionsParser
354354
stateFile <- stateFileConfigParser
355-
handlers <- optional (option buildHandlersOption (long "handlers" <> help "Internal: Handlers for tests"))
355+
handlers <- optional (option buildHandlersOption (long "build-handlers" <> help "Internal: Handlers for tests"))
356356
pure ManagedOptions {..}
357357

358358
bumpParser :: Parser BumpOptions
@@ -400,7 +400,7 @@ maintParser :: Parser ReleaseMaintOptions
400400
maintParser = do
401401
context <- Right <$> optional jsonConfigParser
402402
managed <- managedOptionsParser
403-
handlers <- optional (option maintHandlersOption (long "handlers" <> help "Internal: Handlers for tests"))
403+
handlers <- optional (option maintHandlersOption (long "maint-handlers" <> help "Internal: Handlers for tests"))
404404
config <- maintConfigParser
405405
pure ReleaseMaintOptions {..}
406406

test/bump/test.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
let
2-
args = "--root $PWD --handlers test --hackage hackage.haskell.org:indexState:2024-01-01T00:00:00Z aeson extra path";
2+
args = "--root $PWD --build-handlers test --hackage hackage.haskell.org:indexState:2024-01-01T00:00:00Z aeson extra path";
33
in {
44
git = true;
55

test/maint/test.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
output_match 'Release local2 1.2.0'
2828
step_run release local2 -v 1.2.0
2929
30-
step_run maint --quiet --commit --revision --hackage local:location:$_hackage_url --handlers=test-maint
30+
step_run maint --quiet --commit --revision --hackage local:location:$_hackage_url --maint-handlers=test-maint --build-handlers=test-maint
3131
3232
output_match 'microlens >=0\.4 && <0\.6'
3333
step xh get --follow --auth test:test $_hackage_url/package/local1-1.1.0/revision/1.cabal

test/managed-nom/test.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
let
2-
args = "--root $PWD --handlers test --hackage hackage.haskell.org:indexState:2024-01-01T00:00:00Z";
2+
args = "--root $PWD --build-handlers test --hackage hackage.haskell.org:indexState:2024-01-01T00:00:00Z";
33
in {
44
source = ''
55
mk_pkg()

0 commit comments

Comments
 (0)