change skip-ci to await-ci throughout

Author: joshblum

keybot/darwinbot.go

@@ -31,7 +31,7 @@ func (d *darwinbot) Run(bot *slackbot.Bot, channel string, args []string) (strin
 	buildDarwinClientCommit := buildDarwin.Flag("client-commit", "Build a specific client commit").String()
 	buildDarwinKbfsCommit := buildDarwin.Flag("kbfs-commit", "Build a specific kbfs commit").String()
 	buildDarwinNoPull := buildDarwin.Flag("skip-pull", "Don't pull before building the app").Bool()
-	buildDarwinSkipCI := buildDarwin.Flag("skip-ci", "Whether to skip CI").Bool()
+	buildDarwinAwaitCI := buildDarwin.Flag("await-ci", "Whether to check CI").Bool()
 	buildDarwinSmoke := buildDarwin.Flag("smoke", "Whether to make a pair of builds for smoketesting when on a branch").Bool()
 	buildDarwinNoS3 := buildDarwin.Flag("skip-s3", "Don't push to S3 after building the app").Bool()
 	buildDarwinNoNotarize := buildDarwin.Flag("skip-notarize", "Don't notarize the app").Bool()
@@ -67,7 +67,7 @@ func (d *darwinbot) Run(bot *slackbot.Bot, channel string, args []string) (strin
 
 	case buildDarwin.FullCommand():
 		smokeTest := true
-		skipCI := *buildDarwinSkipCI
+		awaitCI := *buildDarwinAwaitCI
 		testBuild := *buildDarwinTest
 		// If it's a custom build, make it a test build unless --smoke is passed.
 		if *buildDarwinClientCommit != "" || *buildDarwinKbfsCommit != "" {
@@ -91,15 +91,12 @@ func (d *darwinbot) Run(bot *slackbot.Bot, channel string, args []string) (strin
 				{Key: "CLIENT_COMMIT", Value: *buildDarwinClientCommit},
 				{Key: "KBFS_COMMIT", Value: *buildDarwinKbfsCommit},
 				{Key: "ARCH", Value: arch},
-				// TODO: Rename to SKIP_CI in packaging scripts
-				{Key: "NOWAIT", Value: boolToEnvString(skipCI)},
+				{Key: "NOWAIT", Value: boolToEnvString(!awaitCI)},
 				{Key: "NOPULL", Value: boolToEnvString(*buildDarwinNoPull)},
 				{Key: "NOS3", Value: boolToEnvString(*buildDarwinNoS3)},
 				{Key: "NONOTARIZE", Value: boolToEnvString(*buildDarwinNoNotarize)},
 			},
 		}
-		// msg := fmt.Sprintf("I'll run the build as job `%s` (skip-ci=%s smoke=%s test=%s).", script.Label, boolToString(skipCI), boolToString(smokeTest), boolToString(testBuild))
-		// bot.SendMessage(msg, channel)
 
 		return runScript(bot, channel, env, script)
 	case dumplogCmd.FullCommand():

keybot/keybot.go

@@ -31,17 +31,17 @@ func (k *keybot) Run(bot *slackbot.Bot, channel string, args []string) (string,
 	cancelLabel := cancel.Arg("label", "Launchd job label").String()
 
 	buildMobile := build.Command("mobile", "Start an iOS and Android build")
-	buildMobileSkipCI := buildMobile.Flag("skip-ci", "Whether to skip CI").Bool()
+	buildMobileAwaitCI := buildMobile.Flag("await-ci", "Whether to check CI").Bool()
 	buildMobileAutomated := buildMobile.Flag("automated", "Whether this is a timed build").Bool()
 	buildMobileCientCommit := buildMobile.Flag("client-commit", "Build a specific client commit hash").String()
 
 	buildAndroid := build.Command("android", "Start an android build")
-	buildAndroidSkipCI := buildAndroid.Flag("skip-ci", "Whether to skip CI").Bool()
+	buildAndroidAwaitCI := buildAndroid.Flag("await-ci", "Whether to check CI").Bool()
 	buildAndroidAutomated := buildAndroid.Flag("automated", "Whether this is a timed build").Bool()
 	buildAndroidCientCommit := buildAndroid.Flag("client-commit", "Build a specific client commit hash").String()
 	buildIOS := build.Command("ios", "Start an ios build")
 	buildIOSClean := buildIOS.Flag("clean", "Whether to clean first").Bool()
-	buildIOSSkipCI := buildIOS.Flag("skip-ci", "Whether to skip CI").Bool()
+	buildIOSSkipCI := buildIOS.Flag("await-ci", "Whether to skip CI").Bool()
 	buildIOSAutomated := buildIOS.Flag("automated", "Whether this is a timed build").Bool()
 	buildIOSCientCommit := buildIOS.Flag("client-commit", "Build a specific client commit hash").String()
 
@@ -92,7 +92,7 @@ func (k *keybot) Run(bot *slackbot.Bot, channel string, args []string) (string,
 		return launchd.Stop(*cancelLabel)
 
 	case buildMobile.FullCommand():
-		skipCI := *buildMobileSkipCI
+		awaitCI := *buildMobileAwaitCI
 		automated := *buildMobileAutomated
 		script := launchd.Script{
 			Label:      "keybase.build.mobile",
@@ -106,15 +106,15 @@ func (k *keybot) Run(bot *slackbot.Bot, channel string, args []string) (string,
 				{Key: "NDK_HOME", Value: NDKPath},
 				{Key: "ANDROID_NDK", Value: NDKPath},
 				{Key: "CLIENT_COMMIT", Value: *buildMobileCientCommit},
-				{Key: "CHECK_CI", Value: boolToEnvString(!skipCI)},
+				{Key: "CHECK_CI", Value: boolToEnvString(awaitCI)},
 				{Key: "AUTOMATED_BUILD", Value: boolToEnvString(automated)},
 			},
 		}
 		env.GoPath = env.PathFromHome("go-ios")
 		return runScript(bot, channel, env, script)
 
 	case buildAndroid.FullCommand():
-		skipCI := *buildAndroidSkipCI
+		awaitCI := *buildAndroidAwaitCI
 		automated := *buildAndroidAutomated
 		script := launchd.Script{
 			Label:      "keybase.build.android",
@@ -125,15 +125,15 @@ func (k *keybot) Run(bot *slackbot.Bot, channel string, args []string) (string,
 				{Key: "ANDROID_NDK_HOME", Value: NDKPath},
 				{Key: "ANDROID_NDK", Value: NDKPath},
 				{Key: "CLIENT_COMMIT", Value: *buildAndroidCientCommit},
-				{Key: "CHECK_CI", Value: boolToEnvString(!skipCI)},
+				{Key: "CHECK_CI", Value: boolToEnvString(awaitCI)},
 				{Key: "AUTOMATED_BUILD", Value: boolToEnvString(automated)},
 			},
 		}
 		env.GoPath = env.PathFromHome("go-android") // Custom go path for Android so we don't conflict
 		return runScript(bot, channel, env, script)
 
 	case buildIOS.FullCommand():
-		skipCI := *buildIOSSkipCI
+		awaitCI := *buildIOSSkipCI
 		iosClean := *buildIOSClean
 		automated := *buildIOSAutomated
 		script := launchd.Script{
@@ -143,7 +143,7 @@ func (k *keybot) Run(bot *slackbot.Bot, channel string, args []string) (string,
 			EnvVars: []launchd.EnvVar{
 				{Key: "CLIENT_COMMIT", Value: *buildIOSCientCommit},
 				{Key: "CLEAN", Value: boolToEnvString(iosClean)},
-				{Key: "CHECK_CI", Value: boolToEnvString(!skipCI)},
+				{Key: "CHECK_CI", Value: boolToEnvString(awaitCI)},
 				{Key: "AUTOMATED_BUILD", Value: boolToEnvString(automated)},
 			},
 		}

keybot/winbot.go

@@ -42,7 +42,7 @@ func (d *winbot) Run(bot *slackbot.Bot, channel string, args []string) (string,
 	buildWindowsCientCommit := buildWindows.Flag("client-commit", "Build a specific client commit").String()
 	buildWindowsKbfsCommit := buildWindows.Flag("kbfs-commit", "Build a specific kbfs commit").String()
 	buildWindowsUpdaterCommit := buildWindows.Flag("updater-commit", "Build a specific updater commit").String()
-	buildWindowsSkipCI := buildWindows.Flag("skip-ci", "Whether to skip CI").Bool()
+	buildWindowsAwaitCI := buildWindows.Flag("await-ci", "Whether to check CI").Bool()
 	buildWindowsSmoke := buildWindows.Flag("smoke", "Build a smoke pair").Bool()
 	buildWindowsDevCert := buildWindows.Flag("dev-cert", "Build using devel code signing cert").Bool()
 	buildWindowsAuto := buildWindows.Flag("automated", "Specify build was triggered automatically").Hidden().Bool()
@@ -104,7 +104,7 @@ func (d *winbot) Run(bot *slackbot.Bot, channel string, args []string) (string,
 
 	case buildWindows.FullCommand():
 		smokeTest := *buildWindowsSmoke
-		skipCI := *buildWindowsSkipCI
+		awaitCI := *buildWindowsAwaitCI
 		skipTestChannel := *buildWindowsTest
 		devCert := 0
 		if *buildWindowsDevCert {
@@ -133,7 +133,7 @@ func (d *winbot) Run(bot *slackbot.Bot, channel string, args []string) (string,
 			updateChannel = "None"
 		} else if smokeTest {
 			updateChannel = "Smoke"
-			if !skipCI {
+			if awaitCI {
 				updateChannel = "SmokeCI"
 			}
 		}