RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-25 07:52:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,527 Commits 243 Branches 444 Tags 653 MiB
0a74f98628
Commit Graph

109 Commits

Author SHA1 Message Date
Sylvain Rabot
db5b1aa5f6 Makefile: Allow $(GO) to be set with environmental variable (#2919) 
* promu: Use same go invocation as prometheus' for building

If you override $(GO) var in prometheus Makefile in order to use
a custom go binary you might encounter errors while building promu
as promu's Makefile $(GO) var is also defined to look for go in the
$PATH and you might end up using different go binaries for building
prometheus and promu.

This patch makes prometheus Makefile pass its $(GO) var to promu's makefile
as environmental variable.

Signed-off-by: Sylvain Rabot <s.rabot@lectra.com>

* Makefile: Allow $(GO) to be set with environmental variable

Signed-off-by: Sylvain Rabot <s.rabot@lectra.com>

* Makefile: Fix hardcoded call to gofmt

Signed-off-by: Sylvain Rabot <s.rabot@lectra.com>
 2017-11-06 15:55:43 +01:00
beorn7
463faf5816 Ignore staticcheck's SA1019 in discovery/kubernetes/kubernetes.go, too 
This showed up all of a sudden, even if checking out older commits.
 2017-11-04 17:41:39 +01:00
Brian Brazil
73dc96e7f5 Fix leak of ticker in remote storage queue manager. 2017-10-09 19:44:03 +01:00
Brian Brazil
5ee07b3b3a Update staticcheck ignores 
Remove things that now longer apply, ignore new things
that are acceptable.
 2017-10-09 19:44:03 +01:00
Fabian Reinartz
2d0b8e8b94 Merge branch 'master' into dev-2.0 2017-10-05 13:09:18 +02:00
Ben Kochie
0fcfe3209f Add staticcheck to build. 2017-08-28 17:29:01 +02:00
Fabian Reinartz
1df03d8346 make: disable remote tests temporarily 2017-04-27 17:27:19 +02:00
Fabian Reinartz
73b8ff0ddc Merge branch 'master' into dev-2.0 2017-04-27 10:19:55 +02:00
Fabian Reinartz
f2d610c1e5 vendor: update tsdb for fast equal matching 2017-04-10 13:00:27 +02:00
Goutham Veeramachaneni
cffb1acf7f Test Longer Tests in Travis (#2570) 
* Test Longer Tests in Travis

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>

* Make test Target Run All Tests

* Add test-short to run short tests

test is running all the tests now as we are running make tests in
CircleCI and I think the base image is shared across Prometheus Org.

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>

* Remove Empty Line

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-04-07 13:46:06 +02:00
Pontus Leitzler
4774d6736a Use go env to fetch GOPATH to support Go 1.8 
Go 1.8 do not require env GOPATH to be set and make will fail if it isn't set.
 2017-03-22 19:04:20 +01:00
Julius Volz
92d60ba4c0 Add promu installation logging to Makefile 
Due to bad GitHub connectivity, "make" frequently got stuck at the promu
step for me, and I was thinking that "format" was taking a long time
because the promu step wasn't logged. All other Makefile targets have
log statements...
 2016-09-16 00:59:56 +02:00
Bjoern Rabenstein
c7bd563b26 Testing: Add more test targets 2016-08-29 10:53:10 +02:00
Alexey Miroshkin
485f7dde08 Fix data race in lexer and lexer test 
As described in #1898 'go test -race' detects a race in lexer code. This
pacth fixes it and also add '-race' option to test target to prevent
regression.
 2016-08-26 17:07:17 +02:00
Tobias Schmidt
4042392a2d Always format generated assets 
It's easy to forget formatting assets after re-generating them, so let's
do this automatically.
 2016-07-27 19:02:18 -04:00
Joshua Rubin
fd7775e251
fix build with multi-part $GOPATH 2016-05-24 16:50:27 -06:00
Steve Durrheimer
b2292aaa62 Fix git branch with slash as docker tag 2016-04-22 21:47:55 +02:00
Julius Volz
7735d0da63 Fix build for people without $GOPATH/bin in $PATH. 2016-04-22 18:16:00 +02:00
Steve Durrheimer
8688cf2579
New release process using docker, circleci and a centralized 
building tool
 2016-04-18 22:41:04 +02:00
Jonathan Boulle
1c8262be12 Add script to check for missing license headers 
Also adds a `check_license` target to the Makefile to run the script
 2016-04-13 16:08:14 +02:00
Tobias Schmidt
d7889e61bb Detect code style violations in deeply nested files 
So far the style check did not recognize issues in files in deeply
nested directories, e.g. retrieval/discovery/kubernetes/discovery.go.
 2016-03-03 02:21:16 -05:00
Julius Volz
999b1d23e0 Add tarballs target to build release tarballs. 2016-01-27 17:03:44 +01:00
Fabian Reinartz
1d58c10b45 Remove assets target from default make execution 
go-bindata constantly attempts to update timestamps even though
the file data didn't change.

Fixes #1326
 2016-01-18 18:24:25 +01:00
Tobias Schmidt
e7fb9d096b Let code format style errors fail CI 2016-01-06 18:29:28 -05:00
Fabian Reinartz
a542cc8609 Remove -web.use-local-assets 2015-11-11 17:58:03 +01:00
Fabian Reinartz
57ca7108aa Enable debug generation of go-bindata, rename blob/ to ui/ 2015-11-11 15:55:16 +01:00
Tobias Schmidt
ee600cf949 Format web/blob/files.go after generation 2015-10-23 02:51:29 -04:00
Fabian Reinartz
28c2f9e4ff Fix phony targets and log asset generation 2015-09-19 11:51:40 +02:00
Julius Volz
cb02af5747 Fix trailing space in Makefile. 2015-09-18 12:19:27 +02:00
Fabian Reinartz
92ffeadb7b Move assets generation to top level make file 2015-09-17 17:53:54 +02:00
Fabian Reinartz
5127963e93 Replace Makefile with simpler setup 2015-09-17 17:26:36 +02:00
Fabian Reinartz
468d2eb60e Vendoring via govendor 2015-09-15 15:37:12 +02:00
Fabian Reinartz
e88eb9f164 Remove Godeps 2015-09-15 15:35:29 +02:00
Robey Pointer
3a5c0f30c1 create a unix-style tarball with a nested folder 2015-07-28 08:52:41 -07:00
beorn7
b55a71a30c Fix the race condition targets in the Makefile. 
Remove race_condition_run as the original run target has been removed, too.

Fix the race_condition_binary target.
 2015-07-06 22:26:41 +02:00
Steve Durrheimer
016e00441f Add circleci yaml for Dockerfile test build 2015-06-26 11:00:15 +02:00
Fabian Reinartz
6e61fd3e96 tools/rulechecker: bye bye 2015-06-25 19:11:49 +02:00
Julius Volz
c69b733956 Simplify Go dependency handling in Dockerfile. 
Also, put quotes around the GOPATH in the Makefile for safety in case of
spaces, etc.
 2015-06-23 23:58:09 +02:00
Fabian Reinartz
d27e45cc74 make: add promtool to build and tarball targets. 2015-06-22 16:09:37 +02:00
Fabian Reinartz
330ed7b9f2 Merge pull request #809 from prometheus/update-make-format 
Update file exclusion list for `make format`.
 2015-06-15 21:04:28 +02:00
Fabian Reinartz
31325c1fd0 make: adjust to new main location. 2015-06-15 19:01:06 +02:00
Julius Volz
f10effceb1 Update file exclusion list for make format. 2015-06-15 16:31:35 +02:00
Fabian Reinartz
8d304d95e5 make: do not call go-bindata on building. 2015-06-12 09:29:37 +02:00
Sindre Myren
a081c9436b Building without a Makefile (on Windows) 
Main changes:

- Switched to using `go-bindata` in place of `scripts/embed-static.sh`.
- Support for building Prometheus without a `Makefile`.
- Minor typo fix to make Prometheus build on Windows (without Makefiles).

Please note that this does not mean that prometheus will work on Windows.
There are still failing tests!
 2015-06-10 20:43:59 +02:00
Fabian Reinartz
8eda04fbf1 Remove logging output from test runs 2015-05-23 21:21:56 +02:00
Fabian Reinartz
3b0777ff84 Merge branch 'master' into fabxc/servdisc 2015-05-12 15:46:16 +02:00
Fabian Reinartz
5fbde88919 Switch config to YAML format. 2015-05-07 16:52:14 +02:00
Julius Volz
0dc8f3cb04 Remove obsolete "rules" target from main Makefile. 2015-05-07 11:59:06 +02:00
Johannes 'fish' Ziemke
ab3e08e070 Add rule_checker and console templates to archive 2015-05-05 18:40:51 +02:00
Alexander Staubo
8a47f8a44d Makefile: Calculate $(GOROOT), etc. relative to Makefile instead of using $(PWD), which is not always available (eg., in debuild). 2015-02-22 23:14:11 -05:00