Skip to content

Commit 17e98a7

Browse files
authored
Merge pull request #853 from prometheus/repo_sync
Synchronize common files from prometheus/prometheus
2 parents 9ef8685 + 78eb8b8 commit 17e98a7

File tree

1 file changed

+44
-47
lines changed

1 file changed

+44
-47
lines changed

.circleci/config.yml

Lines changed: 44 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
---
21
version: 2.1
3-
42
orbs:
53
go: circleci/[email protected]
6-
4+
prometheus: prometheus/[email protected]
75
jobs:
86
test:
97
parameters:
@@ -19,53 +17,52 @@ jobs:
1917
type: boolean
2018
default: true
2119
docker:
22-
- image: circleci/golang:<< parameters.go_version >>
20+
- image: circleci/golang:<< parameters.go_version >>
2321
working_directory: /go/src/github.com/prometheus/client_golang
2422
steps:
25-
- checkout
26-
- when:
27-
condition: << parameters.use_gomod_cache >>
28-
steps:
29-
- go/load-cache:
30-
key: v1-go<< parameters.go_version >>
31-
- run: make check_license test
32-
- when:
33-
condition: << parameters.run_lint >>
34-
steps:
35-
- run: make lint
36-
- when:
37-
condition: << parameters.run_style_and_unused >>
38-
steps:
39-
- run: make style unused
40-
- when:
41-
condition: << parameters.use_gomod_cache >>
42-
steps:
43-
- go/save-cache:
44-
key: v1-go<< parameters.go_version >>
45-
- store_test_results:
46-
path: test-results
47-
23+
- checkout
24+
- when:
25+
condition: << parameters.use_gomod_cache >>
26+
steps:
27+
- go/load-cache:
28+
key: v1-go<< parameters.go_version >>
29+
- run: make check_license test
30+
- when:
31+
condition: << parameters.run_lint >>
32+
steps:
33+
- run: make lint
34+
- when:
35+
condition: << parameters.run_style_and_unused >>
36+
steps:
37+
- run: make style unused
38+
- when:
39+
condition: << parameters.use_gomod_cache >>
40+
steps:
41+
- go/save-cache:
42+
key: v1-go<< parameters.go_version >>
43+
- store_test_results:
44+
path: test-results
4845
workflows:
4946
version: 2
5047
client_golang:
5148
jobs:
52-
# Refer to README.md for the currently supported versions.
53-
- test:
54-
name: go-1-13
55-
go_version: "1.13"
56-
run_lint: true
57-
- test:
58-
name: go-1-14
59-
go_version: "1.14"
60-
run_lint: true
61-
- test:
62-
name: go-1-15
63-
go_version: "1.15"
64-
run_lint: true
65-
- test:
66-
name: go-1-16
67-
go_version: "1.16"
68-
run_lint: true
69-
# Style and unused/missing packages are only checked against
70-
# the latest supported Go version.
71-
run_style_and_unused: true
49+
# Refer to README.md for the currently supported versions.
50+
- test:
51+
name: go-1-13
52+
go_version: "1.13"
53+
run_lint: true
54+
- test:
55+
name: go-1-14
56+
go_version: "1.14"
57+
run_lint: true
58+
- test:
59+
name: go-1-15
60+
go_version: "1.15"
61+
run_lint: true
62+
- test:
63+
name: go-1-16
64+
go_version: "1.16"
65+
run_lint: true
66+
# Style and unused/missing packages are only checked against
67+
# the latest supported Go version.
68+
run_style_and_unused: true

0 commit comments

Comments
 (0)