Skip to content

Commit 345a67e

Browse files
committed
Merge remote-tracking branch 'origin/master' into rc
2 parents d6b7eba + c6a256d commit 345a67e

File tree

338 files changed

+5244
-11475
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

338 files changed

+5244
-11475
lines changed

.buildkite/hooks/pre-checkout

Lines changed: 0 additions & 6 deletions
This file was deleted.

.buildkite/hooks/pre-exit

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,7 @@
33
set -eo pipefail
44

55
echo "--- :git: cleaning checkout"
6-
chmod -R +w ./_tools || true
6+
if [[ -d "./_tools" ]]; then
7+
chmod -R +w ./_tools
8+
fi
79
git clean -dffx

.buildkite/pipeline.yml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ steps:
1414
command: make clean install-vendor-m3 test-all-gen
1515
env:
1616
CGO_ENABLED: 0
17-
GIMME_GO_VERSION: 1.13.x
17+
GIMME_GO_VERSION: 1.14.x
1818
plugins:
1919
gopath-checkout#v1.0.1:
2020
import: github.com/m3db/m3
@@ -35,8 +35,17 @@ steps:
3535
run: app
3636
workdir: /go/src/github.com/m3db/m3
3737
<<: *common
38-
- name: "Services, Tools, Metalint"
39-
command: make clean install-vendor-m3 services tools metalint
38+
- name: "Services, Tools"
39+
command: make clean install-vendor-m3 services tools
40+
plugins:
41+
docker-compose#v2.5.1:
42+
run: app
43+
workdir: /go/src/github.com/m3db/m3
44+
<<: *common
45+
- name: "Lint"
46+
command: make clean lint
47+
env:
48+
CGO_ENABLED: 0
4049
plugins:
4150
docker-compose#v2.5.1:
4251
run: app
@@ -47,7 +56,7 @@ steps:
4756
parallelism: 2
4857
env:
4958
CGO_ENABLED: 0
50-
GIMME_GO_VERSION: 1.13.x
59+
GIMME_GO_VERSION: 1.14.x
5160
plugins:
5261
gopath-checkout#v1.0.1:
5362
import: github.com/m3db/m3
@@ -57,7 +66,7 @@ steps:
5766
parallelism: 1
5867
env:
5968
CGO_ENABLED: 0
60-
GIMME_GO_VERSION: 1.13.x
69+
GIMME_GO_VERSION: 1.14.x
6170
plugins:
6271
gopath-checkout#v1.0.1:
6372
import: github.com/m3db/m3
@@ -90,7 +99,7 @@ steps:
9099
command: make clean install-vendor-m3 docs-test
91100
env:
92101
CGO_ENABLED: 0
93-
GIMME_GO_VERSION: 1.13.x
102+
GIMME_GO_VERSION: 1.14.x
94103
plugins:
95104
gopath-checkout#v1.0.1:
96105
import: github.com/m3db/m3

.ci

.codecov.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@ coverage:
4444
target: auto
4545
threshold: 5%
4646
flags: m3ninx
47-
m3nsch:
48-
target: auto
49-
threshold: 5%
50-
flags: m3nsch
5147
m3em:
5248
target: auto
5349
threshold: 5%
@@ -79,11 +75,6 @@ coverage:
7975
m3ninx:
8076
paths:
8177
- src/m3ninx/
82-
m3nsch:
83-
paths:
84-
- src/m3nsch/
85-
- src/cmd/services/m3nsch_server
86-
- src/cmd/services/m3nsch_client
8778
m3em:
8879
paths:
8980
- src/m3em/

.excludemetalint

Lines changed: 0 additions & 11 deletions
This file was deleted.

.fossa.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,6 @@ analyze:
6060
path: src/cmd/services/m3em_agent/main
6161
options:
6262
allow-unresolved: true
63-
- name: github.com/m3db/m3/src/cmd/services/m3nsch_client/main
64-
type: go
65-
target: github.com/m3db/m3/src/cmd/services/m3nsch_client/main
66-
path: src/cmd/services/m3nsch_client/main
67-
options:
68-
allow-unresolved: true
69-
- name: github.com/m3db/m3/src/cmd/services/m3nsch_server/main
70-
type: go
71-
target: github.com/m3db/m3/src/cmd/services/m3nsch_server/main
72-
path: src/cmd/services/m3nsch_server/main
73-
options:
74-
allow-unresolved: true
7563
- name: github.com/m3db/m3/src/cmd/services/m3query/main
7664
type: go
7765
target: github.com/m3db/m3/src/cmd/services/m3query/main

0 commit comments

Comments
 (0)