diff --git a/keybot/darwinbot.go b/keybot/darwinbot.go index 6d872dd..bbb2d10 100644 --- a/keybot/darwinbot.go +++ b/keybot/darwinbot.go @@ -30,7 +30,6 @@ 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() 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() @@ -66,7 +65,6 @@ func (d *darwinbot) Run(bot *slackbot.Bot, channel string, args []string) (strin case buildDarwin.FullCommand(): smokeTest := true - skipCI := *buildDarwinSkipCI testBuild := *buildDarwinTest // If it's a custom build, make it a test build unless --smoke is passed. if *buildDarwinClientCommit != "" || *buildDarwinKbfsCommit != "" { @@ -83,8 +81,7 @@ func (d *darwinbot) Run(bot *slackbot.Bot, channel string, args []string) (strin {Key: "TEST", Value: boolToEnvString(testBuild)}, {Key: "CLIENT_COMMIT", Value: *buildDarwinClientCommit}, {Key: "KBFS_COMMIT", Value: *buildDarwinKbfsCommit}, - // TODO: Rename to SKIP_CI in packaging scripts - {Key: "NOWAIT", Value: boolToEnvString(skipCI)}, + {Key: "NOWAIT", Value: boolToEnvString(true)}, {Key: "NOPULL", Value: boolToEnvString(*buildDarwinNoPull)}, {Key: "NOS3", Value: boolToEnvString(*buildDarwinNoS3)}, {Key: "NONOTARIZE", Value: boolToEnvString(*buildDarwinNoNotarize)}, diff --git a/keybot/keybot.go b/keybot/keybot.go index 77d1bd9..07e131c 100644 --- a/keybot/keybot.go +++ b/keybot/keybot.go @@ -31,17 +31,14 @@ 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() 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() 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() 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 +89,6 @@ func (k *keybot) Run(bot *slackbot.Bot, channel string, args []string) (string, return launchd.Stop(*cancelLabel) case buildMobile.FullCommand(): - skipCI := *buildMobileSkipCI automated := *buildMobileAutomated script := launchd.Script{ Label: "keybase.build.mobile", @@ -106,7 +102,7 @@ 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(false)}, {Key: "AUTOMATED_BUILD", Value: boolToEnvString(automated)}, }, } @@ -114,7 +110,6 @@ func (k *keybot) Run(bot *slackbot.Bot, channel string, args []string) (string, return runScript(bot, channel, env, script) case buildAndroid.FullCommand(): - skipCI := *buildAndroidSkipCI automated := *buildAndroidAutomated script := launchd.Script{ Label: "keybase.build.android", @@ -125,7 +120,7 @@ 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(false)}, {Key: "AUTOMATED_BUILD", Value: boolToEnvString(automated)}, }, } @@ -133,7 +128,6 @@ func (k *keybot) Run(bot *slackbot.Bot, channel string, args []string) (string, return runScript(bot, channel, env, script) case buildIOS.FullCommand(): - skipCI := *buildIOSSkipCI iosClean := *buildIOSClean automated := *buildIOSAutomated script := launchd.Script{ @@ -143,7 +137,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(false)}, {Key: "AUTOMATED_BUILD", Value: boolToEnvString(automated)}, }, } diff --git a/keybot/winbot.go b/keybot/winbot.go index db0c9e1..e52d9b3 100644 --- a/keybot/winbot.go +++ b/keybot/winbot.go @@ -42,7 +42,6 @@ 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() 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 +103,6 @@ func (d *winbot) Run(bot *slackbot.Bot, channel string, args []string) (string, case buildWindows.FullCommand(): smokeTest := *buildWindowsSmoke - skipCI := *buildWindowsSkipCI skipTestChannel := *buildWindowsTest devCert := 0 if *buildWindowsDevCert { @@ -133,9 +131,6 @@ func (d *winbot) Run(bot *slackbot.Bot, channel string, args []string) (string, updateChannel = "None" } else if smokeTest { updateChannel = "Smoke" - if !skipCI { - updateChannel = "SmokeCI" - } } msg := fmt.Sprintf(autoBuild+"I'm starting the job `windows build`. To cancel run `!%s cancel`. ", bot.Name())