From 52b2151b21b362833257df7e04f8c6ad50501628 Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Tue, 12 May 2020 13:03:43 +0200 Subject: [PATCH] go generate ./packer --- CHANGELOG.md | 2 ++ command/build.go | 3 +-- packer/run_interfaces.go | 5 ++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e23cd8679..20e0a5894 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ ### BACKWARDS INCOMPATIBILITIES: * core/hcl2: Maps are now treated as settable arguments as opposed to blocks. For example `tags = {}` instead of `tags {}` [GH-9035] +* `packer build` command: removed option to set `parallel=false`, use + `-parallel-builds=1` for this. ### FEATURES: * **New Builder** azure-dtl allows creation of devtestlabs images in Azure diff --git a/command/build.go b/command/build.go index 5a9413ba8..d77dd1da8 100644 --- a/command/build.go +++ b/command/build.go @@ -374,8 +374,7 @@ Options: -force Force a build to continue if artifacts exist, deletes existing artifacts. -machine-readable Produce machine-readable output. -on-error=[cleanup|abort|ask] If the build fails do: clean up (default), abort, or ask. - -parallel-builds=1 Disable parallelization. (Default: true) - -parallel-builds=1 Number of builds to run in parallel. 0 means no limit (Default: 0) + -parallel-builds=1 Number of builds to run in parallel. 1 disables parallelization. 0 means no limit (Default: 0) -timestamp-ui Enable prefixing of each ui output with an RFC3339 timestamp. -var 'key=value' Variable for templates, can be used multiple times. -var-file=path JSON file containing user variables. [ Note that even in HCL mode this expects file to contain JSON, a fix is comming soon ] diff --git a/packer/run_interfaces.go b/packer/run_interfaces.go index a7c79ff58..8403a0b53 100644 --- a/packer/run_interfaces.go +++ b/packer/run_interfaces.go @@ -19,14 +19,13 @@ type BuildGetter interface { type FixConfigMode int const ( + // Stdout will make FixConfig simply print what the config should be; it + // will only work when a single file is passed. Stdout FixConfigMode = iota // Inplace fixes your files on the spot. Inplace // Diff shows a full diff. Diff - // SimpleOutput will simply print what the config should be; it will only - // work when a single file is passed. - SimpleOutput ) type FixConfigOptions struct {