Skip to content

Commit 2f5f2dd

Browse files
joshblumjoshblum
committed
always skip ci
1 parent f9ad657 commit 2f5f2dd

File tree

3 files changed

+4
-18
lines changed

3 files changed

+4
-18
lines changed

‎keybot/darwinbot.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ func (d *darwinbot) Run(bot *slackbot.Bot, channel string, args []string) (strin
3030
buildDarwinClientCommit := buildDarwin.Flag("client-commit", "Build a specific client commit").String()
3131
buildDarwinKbfsCommit := buildDarwin.Flag("kbfs-commit", "Build a specific kbfs commit").String()
3232
buildDarwinNoPull := buildDarwin.Flag("skip-pull", "Don't pull before building the app").Bool()
33-
buildDarwinSkipCI := buildDarwin.Flag("skip-ci", "Whether to skip CI").Bool()
3433
buildDarwinSmoke := buildDarwin.Flag("smoke", "Whether to make a pair of builds for smoketesting when on a branch").Bool()
3534
buildDarwinNoS3 := buildDarwin.Flag("skip-s3", "Don't push to S3 after building the app").Bool()
3635
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
6665

6766
case buildDarwin.FullCommand():
6867
smokeTest := true
69-
skipCI := *buildDarwinSkipCI
7068
testBuild := *buildDarwinTest
7169
// If it's a custom build, make it a test build unless --smoke is passed.
7270
if *buildDarwinClientCommit != "" || *buildDarwinKbfsCommit != "" {
@@ -83,8 +81,7 @@ func (d *darwinbot) Run(bot *slackbot.Bot, channel string, args []string) (strin
8381
{Key: "TEST", Value: boolToEnvString(testBuild)},
8482
{Key: "CLIENT_COMMIT", Value: *buildDarwinClientCommit},
8583
{Key: "KBFS_COMMIT", Value: *buildDarwinKbfsCommit},
86-
// TODO: Rename to SKIP_CI in packaging scripts
87-
{Key: "NOWAIT", Value: boolToEnvString(skipCI)},
84+
{Key: "NOWAIT", Value: boolToEnvString(true)},
8885
{Key: "NOPULL", Value: boolToEnvString(*buildDarwinNoPull)},
8986
{Key: "NOS3", Value: boolToEnvString(*buildDarwinNoS3)},
9087
{Key: "NONOTARIZE", Value: boolToEnvString(*buildDarwinNoNotarize)},

‎keybot/keybot.go‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,14 @@ func (k *keybot) Run(bot *slackbot.Bot, channel string, args []string) (string,
3131
cancelLabel := cancel.Arg("label", "Launchd job label").String()
3232

3333
buildMobile := build.Command("mobile", "Start an iOS and Android build")
34-
buildMobileSkipCI := buildMobile.Flag("skip-ci", "Whether to skip CI").Bool()
3534
buildMobileAutomated := buildMobile.Flag("automated", "Whether this is a timed build").Bool()
3635
buildMobileCientCommit := buildMobile.Flag("client-commit", "Build a specific client commit hash").String()
3736

3837
buildAndroid := build.Command("android", "Start an android build")
39-
buildAndroidSkipCI := buildAndroid.Flag("skip-ci", "Whether to skip CI").Bool()
4038
buildAndroidAutomated := buildAndroid.Flag("automated", "Whether this is a timed build").Bool()
4139
buildAndroidCientCommit := buildAndroid.Flag("client-commit", "Build a specific client commit hash").String()
4240
buildIOS := build.Command("ios", "Start an ios build")
4341
buildIOSClean := buildIOS.Flag("clean", "Whether to clean first").Bool()
44-
buildIOSSkipCI := buildIOS.Flag("skip-ci", "Whether to skip CI").Bool()
4542
buildIOSAutomated := buildIOS.Flag("automated", "Whether this is a timed build").Bool()
4643
buildIOSCientCommit := buildIOS.Flag("client-commit", "Build a specific client commit hash").String()
4744

@@ -92,7 +89,6 @@ func (k *keybot) Run(bot *slackbot.Bot, channel string, args []string) (string,
9289
return launchd.Stop(*cancelLabel)
9390

9491
case buildMobile.FullCommand():
95-
skipCI := *buildMobileSkipCI
9692
automated := *buildMobileAutomated
9793
script := launchd.Script{
9894
Label: "keybase.build.mobile",
@@ -106,15 +102,14 @@ func (k *keybot) Run(bot *slackbot.Bot, channel string, args []string) (string,
106102
{Key: "NDK_HOME", Value: NDKPath},
107103
{Key: "ANDROID_NDK", Value: NDKPath},
108104
{Key: "CLIENT_COMMIT", Value: *buildMobileCientCommit},
109-
{Key: "CHECK_CI", Value: boolToEnvString(!skipCI)},
105+
{Key: "CHECK_CI", Value: boolToEnvString(false)},
110106
{Key: "AUTOMATED_BUILD", Value: boolToEnvString(automated)},
111107
},
112108
}
113109
env.GoPath = env.PathFromHome("go-ios")
114110
return runScript(bot, channel, env, script)
115111

116112
case buildAndroid.FullCommand():
117-
skipCI := *buildAndroidSkipCI
118113
automated := *buildAndroidAutomated
119114
script := launchd.Script{
120115
Label: "keybase.build.android",
@@ -125,15 +120,14 @@ func (k *keybot) Run(bot *slackbot.Bot, channel string, args []string) (string,
125120
{Key: "ANDROID_NDK_HOME", Value: NDKPath},
126121
{Key: "ANDROID_NDK", Value: NDKPath},
127122
{Key: "CLIENT_COMMIT", Value: *buildAndroidCientCommit},
128-
{Key: "CHECK_CI", Value: boolToEnvString(!skipCI)},
123+
{Key: "CHECK_CI", Value: boolToEnvString(false)},
129124
{Key: "AUTOMATED_BUILD", Value: boolToEnvString(automated)},
130125
},
131126
}
132127
env.GoPath = env.PathFromHome("go-android") // Custom go path for Android so we don't conflict
133128
return runScript(bot, channel, env, script)
134129

135130
case buildIOS.FullCommand():
136-
skipCI := *buildIOSSkipCI
137131
iosClean := *buildIOSClean
138132
automated := *buildIOSAutomated
139133
script := launchd.Script{
@@ -143,7 +137,7 @@ func (k *keybot) Run(bot *slackbot.Bot, channel string, args []string) (string,
143137
EnvVars: []launchd.EnvVar{
144138
{Key: "CLIENT_COMMIT", Value: *buildIOSCientCommit},
145139
{Key: "CLEAN", Value: boolToEnvString(iosClean)},
146-
{Key: "CHECK_CI", Value: boolToEnvString(!skipCI)},
140+
{Key: "CHECK_CI", Value: boolToEnvString(false)},
147141
{Key: "AUTOMATED_BUILD", Value: boolToEnvString(automated)},
148142
},
149143
}

‎keybot/winbot.go‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ func (d *winbot) Run(bot *slackbot.Bot, channel string, args []string) (string,
4242
buildWindowsCientCommit := buildWindows.Flag("client-commit", "Build a specific client commit").String()
4343
buildWindowsKbfsCommit := buildWindows.Flag("kbfs-commit", "Build a specific kbfs commit").String()
4444
buildWindowsUpdaterCommit := buildWindows.Flag("updater-commit", "Build a specific updater commit").String()
45-
buildWindowsSkipCI := buildWindows.Flag("skip-ci", "Whether to skip CI").Bool()
4645
buildWindowsSmoke := buildWindows.Flag("smoke", "Build a smoke pair").Bool()
4746
buildWindowsDevCert := buildWindows.Flag("dev-cert", "Build using devel code signing cert").Bool()
4847
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,
104103

105104
case buildWindows.FullCommand():
106105
smokeTest := *buildWindowsSmoke
107-
skipCI := *buildWindowsSkipCI
108106
skipTestChannel := *buildWindowsTest
109107
devCert := 0
110108
if *buildWindowsDevCert {
@@ -133,9 +131,6 @@ func (d *winbot) Run(bot *slackbot.Bot, channel string, args []string) (string,
133131
updateChannel = "None"
134132
} else if smokeTest {
135133
updateChannel = "Smoke"
136-
if !skipCI {
137-
updateChannel = "SmokeCI"
138-
}
139134
}
140135

141136
msg := fmt.Sprintf(autoBuild+"I'm starting the job `windows build`. To cancel run `!%s cancel`. ", bot.Name())

0 commit comments

Comments
 (0)