47 Commits

Author SHA1 Message Date
Piotr Kiełkowicz
8ce4743cb0 github.com/fatih/hclfmt was archived. Technically there is a possibility to fork (or used another forked version) to executle hclfmt.
But it leads to another issues - problems with importing https://github.com/hashicorp/hcl/hcl/printers. HCL was released in version 2 so that the file structure was changes.
I do not see any way to install it in changed Makefile. Go installs does not support pining to given tags so that always the newest version is installed.

For now, the impact on build process should be minimal. it is used only in ./tools/lint/lint() method. I was able to execute it locally without executing hclfmt.
2021-03-03 11:06:33 +01:00
Daniel Holbach
cc85b48151 Merge commit '37ea4937a4de85a51c6f7af501f0a59c0f96f44a' into update-build-tools 2020-09-03 10:15:13 +02:00
Bryan Boreham
6dbc15bf7c Merge commit 'a0d60e4de9013b35542a8aee145ef2e95f3d9eb2' into update-backend-build
Update 'tools' subtree to latest.
2019-10-02 14:34:20 +00:00
Daniel Holbach
1cf1eead6b update flask version too 2019-08-21 16:19:46 +02:00
Daniel Holbach
9fd9ae1da8 Merge commit '5e3c8ab35850163674a069eb8f02cb0e7509b163' into drop-email2 2019-01-08 08:10:12 +05:30
Daniel Holbach
2220971b4c revert change, pull in subtree update in next step 2019-01-08 08:10:04 +05:30
Daniel Holbach
ec8b1417c7 weave-users mailing list is closed: https://groups.google.com/a/weave.works/forum/#!topic/weave-users/0QXWGOPdBfY
Signed-off-by: Daniel Holbach <daniel@weave.works>
2019-01-07 18:03:32 +05:30
Bryan Boreham
1e5cdc4210 Merge commit '7f4bab626e5544d14293f2ab79b2b0642125476a' 2018-08-10 12:31:52 +00:00
Bryan Boreham
cfc460270a Undo changes made in the 'tools' subtree
This is vendor'd in from weaveworks/build-tools so must not be changed
here.
2018-08-10 11:54:26 +00:00
Marc Carré
2ba50b8b3d Update golang.org/x/net/context to latest
```
$ gvt delete golang.org/x/net/context
$ gvt fetch golang.org/x/net/context
2018/07/23 18:03:49 Fetching: golang.org/x/net/context
$ git grep -l "golang.org/x/net/context" | grep -v vendor | xargs sed -i '' 's:golang.org/x/net/context:context:g'
$ git grep -l "context/ctxhttp" | grep -v vendor | xargs sed -i '' 's:context/ctxhttp:golang.org/x/net/context/ctxhttp:g'
$ gofmt -s -w app
$ gofmt -s -w common
$ gofmt -s -w probe
$ gofmt -s -w prog
$ gofmt -s -w tools
```
fixed a bunch of:
```
cannot use func literal (type func("github.com/weaveworks/scope/vendor/golang.org/x/net/context".Context) error) as type func("context".Context) error
```
2018-07-23 20:10:18 +02:00
cglewis
bbde07d42f MAINTAINER is deprecated, now using LABEL 2017-10-31 10:32:09 -07:00
Bryan Boreham
19b7c97090 Merge commit '1eeb4d0d80f2c02805b531c09e88658fb72b78a8' into unit-test-tags
Bring in updates to tools subdir
2017-07-13 16:18:44 +00:00
Roland Schilter
b78745f615 Execute tests in the prog/ directory (#2567)
Also fixed prog/main_test.go (which has never been part of the test suite so far)
2017-06-08 15:41:53 +02:00
Alban Crequy
bd4130fb53 Merge commit 'd901f2b9cf6b0840b37285a9c8157bfc9ff2da76' into alban/shfmt-2 2017-05-22 17:27:54 +02:00
Alfonso Acosta
a7d37ed366 Merge commit 'b92447c6abbc8f8e6f1d33a8a4c961ba340dbf23' into secure-integration-tests 2017-03-08 16:23:06 +00:00
Alessandro Puccetti
d1f5fcaaec Merge commit '6a1af9ac0e65098e0b4e914ce451f6bd1e659f60' into alessandro/integration-fix 2017-02-21 16:55:24 +01:00
Alfonso Acosta
0fd000ef3d Merge commit '52d1ae404acd6c7e7561cd5560bb602662cf159f' into bump-tools 2017-01-19 11:23:39 +00:00
Iago López Galeiras
43d9f38c5e Fix various linter issues
Found via shellcheck.
2017-01-18 11:51:41 +01:00
Iago López Galeiras
5d06a23fe1 tools: remove generate_latest_map
It seems it was added directly to the scope repo instead of adding it to
the build-tools repo so we need to delete it manually.
2017-01-09 16:40:16 +01:00
Iago López Galeiras
3522a3f556 Merge commit 'd9ce1d58e9cbcd67823ee0abe8dd346a9aa6d120' into iaguis/fix-lint 2017-01-09 14:40:34 +01:00
Alban Crequy
3c40892add linter: fix punctuation and capitalization
Symptoms:
> app/control_router.go:44:38: error strings should not be capitalized or end with punctuation or a newline

This is blocking the build on:
https://circleci.com/gh/kinvolk/scope/363
2016-11-23 17:17:14 +01:00
Lorenzo Manacorda
008b162c0a Merge commit '7eb07eebff9bc1297c87a04ee4d703b491bc8ca2' 2016-10-19 12:37:12 +02:00
Alfonso Acosta
151ce44d37 Merge commit '4fe078a730d70c7936f1c43a1eca881f934bffce' 2016-08-26 13:17:55 +00:00
Mike Lang
21cfc83a56 Use image-tag from build-tools (#1785)
* Squashed 'tools/' changes from e9e7e6b..db5efc0

db5efc0 Merge pull request #28 from weaveworks/mike/add-image-tag
5312c40 Import image-tag script into build tools so it can be shared
7e850f8 Fix logs path
dda9785 Update deploy api
f2f4e5b Fix the wcloud client
3925eb6 Merge pull request #27 from weaveworks/wcloud-events
77355b9 Lint
d9a1c6c Add wcloud events, update flags and error nicely when there is no config

git-subtree-dir: tools
git-subtree-split: db5efc0537

* Remove ./image-tag and use ./tools/image-tag instead

image-tag is now shared code from the build-tools repo
2016-08-16 15:52:12 +01:00
Krzesimir Nowak
7f46b90e27 Make LatestMap "generic"
This commit makes the LatestMap type a sort of a base class, that
should not be used directly. This also adds a generator for LatestMap
"concrete" types with a specific data type in the LatestEntry.
2016-08-12 17:03:42 +02:00
Krzesimir Nowak
0f1cb82084 Allow testing only a subset of directories
This can be done by calling TESTDIRS="./report ./probe" make tests
2016-08-12 17:03:42 +02:00
Krzesimir Nowak
97eb8d033d Do not spell check Makefiles and JSON files
Spell check does not handle JSON files very well. It finds misspelled
words in hexadecimal hashes (like misspelled "dead" in "123daed456").

Ignore Makefiles too - there is not so much free text to spell check
and the spell check complains about words it was told by Makefile to
ignore.
2016-08-04 12:02:39 +02:00
Jonathan Lange
a7d421eeb2 Merge commit '3881934fdc7e6ea644288432ce910e4ee73b2fa8' into new-build-tools
Update to latest build-tools
2016-07-15 11:36:18 +01:00
Jonathan Lange
7c94ade7f4 Merge commit 'ca9e0387d063905e681e44a3fbd2ddf1b1682f91' into tools-with-shellcheck
Update for shell-lint review tweaks
2016-07-12 18:07:42 +01:00
Jonathan Lange
f309c36898 Merge commit '7a35f21ea33d03d1d14c58b8b3dc780566908b3c' into tools-with-shellcheck
Tools for linting shell scripts
2016-07-12 14:21:55 +01:00
Tom Wilkie
34f985038e Merge commit '6d73a44ddad8f85fdd29b2ab5202742b98155f37' into docs-automation 2016-05-18 12:51:06 +01:00
Tom Wilkie
315a3f6b55 Merge commit '8b5ff7765ab5ec63e84862d9332383ba856f8367' into misspell 2016-03-23 11:18:39 +00:00
Tom Wilkie
475521c531 Merge commit '930b53f5459567d79c927951168f3fc73f1c5cd0' into update-tools-subtree 2016-02-22 14:18:29 +00:00
Tom Wilkie
ea90c196e9 Undo change to tools/lint 2016-02-22 14:04:11 +00:00
Simon Howe
2c626776a1 Grey out bottom of stack when there aren't 3 nodes in the stack
E.g. greying out the bottom 2/3 visual nodes if the stack actually only
has a single node.

- Server returns "node_count" for agg nodes.
2016-02-22 12:42:37 +01:00
Tom Wilkie
76080c16ed Merge commit 'f190efdb2b872e943bd3deb00f52ef0dda65c0ce' into version-check 2016-02-04 15:38:41 +00:00
Tom Wilkie
e01f7741bc Merge commit '0441e70ba033aa5417122d474bd6461fd3d538e6' into build-example-in-container 2016-01-16 12:11:34 -08:00
Tom Wilkie
e5d58ac48d Merge commit '795436ef81231002c10e1dfbc415260016e7245b' into tools 2016-01-13 15:58:47 -08:00
Tom Wilkie
e952301980 Merge commit '98bca0b55277bae736a99f1861217fa843418328' into increase-test-replicas 2016-01-12 21:55:12 +00:00
Tom Wilkie
8474279281 Merge commit '718f63610989cb2503b74dfe640d1869e97095d0' into speed-up-tests 2016-01-08 19:31:35 +00:00
Tom Wilkie
9878967263 Merge commit 'a7eef92988bac018db216ba2cc0325d82b42d44f' 2015-12-07 14:53:05 +00:00
Tom Wilkie
40135dc284 Merge commit 'c0f3a59726ecb6842632fee77c6a28858f617270' into coverage 2015-11-10 12:08:03 +00:00
Tom Wilkie
23c253fadc Merge commit '3f0b0e13653383eb630e6482a9b3d8c29891c9bf' into 587-parallelise 2015-11-04 15:36:21 +00:00
Tom Wilkie
e3f8e142d5 Merge commit '5b32aa68b714b61558e454001e80009319005ea2' into fix-natmapper-conntracker 2015-10-27 13:17:35 +00:00
Tom Wilkie
0e22171e46 Merge commit '21c126249fcb7bf8566035c43fc38f52637c17e3' into 535-vendor 2015-10-26 17:08:11 +00:00
Tom Wilkie
283e69decc Merge commit 'c6a083dd90ebe76e377a224dcc3e1e3c7ad95e66' into 535-vendor 2015-10-26 16:59:05 +00:00
Tom Wilkie
011a55358f Merge commit '8b52b10e38553a35d8134b428d6118a1ac011804' as 'tools' 2015-10-26 15:13:15 +00:00