Skip to content

Add skip pull for cleanup commands #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jzila wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add skip pull for cleanup commands #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions keybot/keybot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ func (k *keybot) Run(bot *slackbot.Bot, channel string, args []string) (string,
stringBuffer := new(bytes.Buffer)
app.Writer(stringBuffer)

appSkipPull := app.Flag("skip-pull", "Don't pull before executing a command").Bool()

build := app.Command("build", "Build things")

cancel := app.Command("cancel", "Cancel")
Expand Down Expand Up @@ -82,6 +84,10 @@ func (k *keybot) Run(bot *slackbot.Bot, channel string, args []string) (string,
env := launchd.NewEnv(home, path)
NDKPath := "/usr/local/opt/android-sdk/ndk-bundle"
androidHome := "/usr/local/opt/android-sdk"

baseEnvVars := []launchd.EnvVar{
launchd.EnvVar{Key: "NOPULL", Value: boolToEnvString(*appSkipPull)},
}
switch cmd {
case cancel.FullCommand():
if *cancelLabel == "" {
Expand Down Expand Up @@ -182,11 +188,11 @@ func (k *keybot) Run(bot *slackbot.Bot, channel string, args []string) (string,
Label: "keybase.gitdiff",
Path: "github.com/keybase/slackbot/scripts/run_and_send_stdout.sh",
BucketName: "prerelease.keybase.io",
EnvVars: []launchd.EnvVar{
EnvVars: append(baseEnvVars,
launchd.EnvVar{Key: "REPO", Value: repoParsed},
launchd.EnvVar{Key: "PREFIX_GOPATH", Value: boolToEnvString(true)},
launchd.EnvVar{Key: "SCRIPT_TO_RUN", Value: "./git_diff.sh"},
},
),
}
return runScript(bot, channel, env, script)

Expand All @@ -195,9 +201,9 @@ func (k *keybot) Run(bot *slackbot.Bot, channel string, args []string) (string,
Label: "keybase.gitclean",
Path: "github.com/keybase/slackbot/scripts/run_and_send_stdout.sh",
BucketName: "prerelease.keybase.io",
EnvVars: []launchd.EnvVar{
EnvVars: append(baseEnvVars,
launchd.EnvVar{Key: "SCRIPT_TO_RUN", Value: "./git_clean.sh"},
},
),
}
return runScript(bot, channel, env, script)

Expand All @@ -206,9 +212,9 @@ func (k *keybot) Run(bot *slackbot.Bot, channel string, args []string) (string,
Label: "keybase.nodeModuleClean",
Path: "github.com/keybase/slackbot/scripts/run_and_send_stdout.sh",
BucketName: "prerelease.keybase.io",
EnvVars: []launchd.EnvVar{
EnvVars: append(baseEnvVars,
launchd.EnvVar{Key: "SCRIPT_TO_RUN", Value: "./node_module_clean.sh"},
},
),
}
return runScript(bot, channel, env, script)

Expand Down