Merge #76390

76390: dev: disable `doctor` check for `merge-test-xmls` r=irfansharif a=rickystewart Closes #76385. Release note: None Co-authored-by: Ricky Stewart <[email protected]>
cockroachdb · Feb 11, 2022 · ce55af9 · ce55af9
2 parents c459d39 + 8b04772
commit ce55af9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/dev b/dev
@@ -3,7 +3,7 @@
 set -euo pipefail
 
 # Bump this counter to force rebuilding `dev` on all machines.
-DEV_VERSION=14
+DEV_VERSION=15
 
 THIS_DIR=$(cd "$(dirname "$0")" && pwd)
 BINARY_DIR=$THIS_DIR/bin/dev-versions

diff --git a/pkg/cmd/dev/dev.go b/pkg/cmd/dev/dev.go
@@ -133,8 +133,8 @@ Typical usage:
 	var debugVar bool
 	ret.cli.PersistentFlags().BoolVar(&debugVar, "debug", false, "enable debug logging for dev")
 	ret.cli.PersistentPreRunE = func(cmd *cobra.Command, args []string) error {
-		isDoctor := cmd.Name() == "doctor"
-		if !isDoctor {
+		skipDoctorCheck := cmd.Name() == "doctor" || cmd.Name() == "merge-test-xmls"
+		if !skipDoctorCheck {
 			if err := ret.checkDoctorStatus(cmd.Context()); err != nil {
 				return err
 			}