mirror of
https://github.com/weaveworks/scope.git
synced 2026-03-04 18:51:17 +00:00
Squashed 'tools/' changes from 0620e58..e9e7e6b
e9e7e6bMerge pull request #26 from weaveworks/this-time-for-suredf494d6Remove dependenciesc045d16Properly exclude vendor from lint2cfcf08Add blacklist to wcloud clientca6ebfbMerge pull request #25 from weaveworks/fix-brokennessbfb1747Test directories need ./ prefixes, obviously.5b9b314Merge pull request #24 from weaveworks/find-files8786427Remove spurious debugging code from test8b7ec6eSpeed up test by using git ls-filescf53dc1Exclude vendor from shell lintingb2ab380Fix field namec86fd3dAdd notification config for wcloudf643920Merge pull request #23 from weaveworks/only-lint-git-files47a0152Only lint git files50d47f9Merge pull request #22 from weaveworks/shell-lint git-subtree-dir: tools git-subtree-split:e9e7e6b0f0
This commit is contained in:
@@ -21,4 +21,15 @@ type Config struct {
|
||||
RepoPath string `json:"repo_path" yaml:"repo_path"`
|
||||
RepoKey string `json:"repo_key" yaml:"repo_key"`
|
||||
KubeconfigPath string `json:"kubeconfig_path" yaml:"kubeconfig_path"`
|
||||
|
||||
Notifications []NotificationConfig `json:"notifications" yaml:"notifications"`
|
||||
|
||||
// Globs of files not to change, relative to the route of the repo
|
||||
ConfigFileBlackList []string `json:"config_file_black_list" yaml:"config_file_black_list"`
|
||||
}
|
||||
|
||||
// NotificationConfig describes how to send notifications
|
||||
type NotificationConfig struct {
|
||||
SlackWebhookURL string `json:"slack_webhook_url" yaml:"slack_webhook_url"`
|
||||
SlackUsername string `json:"slack_username" yaml:"slack_username"`
|
||||
}
|
||||
|
||||
@@ -4,10 +4,8 @@
|
||||
#
|
||||
# e.g.
|
||||
# $ files-with-type text/x-shellscript k8s infra
|
||||
#
|
||||
# Assumes `find`, `xargs`, and `file` are all installed.
|
||||
|
||||
mime_type=$1
|
||||
shift
|
||||
|
||||
find "$@" -print0 -type f |xargs -0 file --mime-type | grep "${mime_type}" | sed -e 's/:.*$//'
|
||||
git ls-files "$@" | grep -vE '^vendor/' | xargs file --mime-type | grep "${mime_type}" | sed -e 's/:.*$//'
|
||||
|
||||
2
lint
2
lint
@@ -166,7 +166,7 @@ function lint_files {
|
||||
|
||||
function list_files {
|
||||
if [ $# -gt 0 ]; then
|
||||
find "$@" -type f | grep -vE '(^\./\.git|^\./\.pkg|/vendor/|/node_modules/|\.codecgen\.go$|\.generated\.go$)'
|
||||
git ls-files --exclude-standard | grep -vE '(^|/)vendor/'
|
||||
else
|
||||
git diff --cached --name-only
|
||||
fi
|
||||
|
||||
5
test
5
test
@@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -ex
|
||||
set -e
|
||||
|
||||
DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
GO_TEST_ARGS=( -tags netgo -cpu 4 -timeout 8m )
|
||||
@@ -47,7 +47,8 @@ fi
|
||||
|
||||
fail=0
|
||||
|
||||
TESTDIRS=( $(find . -type f -name '*_test.go' -print0 | xargs -0 -n1 dirname | grep -vE '^\./(\.git|vendor|prog|experimental)/' | sort -u) )
|
||||
# NB: Relies on paths being prefixed with './'.
|
||||
TESTDIRS=( $(git ls-files -- '*_test.go' | grep -vE '^(vendor|prog|experimental)/' | xargs -n1 dirname | sort -u | sed -e 's|^|./|') )
|
||||
|
||||
# If running on circle, use the scheduler to work out what tests to run on what shard
|
||||
if [ -n "$CIRCLECI" ] && [ -z "$NO_SCHEDULER" ] && [ -x "$DIR/sched" ]; then
|
||||
|
||||
Reference in New Issue
Block a user