Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into rc
Browse files Browse the repository at this point in the history
  • Loading branch information
rallen090 committed Nov 9, 2020
2 parents d6b7eba + c6a256d commit 345a67e
Show file tree
Hide file tree
Showing 338 changed files with 5,244 additions and 11,475 deletions.
6 changes: 0 additions & 6 deletions .buildkite/hooks/pre-checkout

This file was deleted.

4 changes: 3 additions & 1 deletion .buildkite/hooks/pre-exit
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
set -eo pipefail

echo "--- :git: cleaning checkout"
chmod -R +w ./_tools || true
if [[ -d "./_tools" ]]; then
chmod -R +w ./_tools
fi
git clean -dffx
21 changes: 15 additions & 6 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ steps:
command: make clean install-vendor-m3 test-all-gen
env:
CGO_ENABLED: 0
GIMME_GO_VERSION: 1.13.x
GIMME_GO_VERSION: 1.14.x
plugins:
gopath-checkout#v1.0.1:
import: github.com/m3db/m3
Expand All @@ -35,8 +35,17 @@ steps:
run: app
workdir: /go/src/github.com/m3db/m3
<<: *common
- name: "Services, Tools, Metalint"
command: make clean install-vendor-m3 services tools metalint
- name: "Services, Tools"
command: make clean install-vendor-m3 services tools
plugins:
docker-compose#v2.5.1:
run: app
workdir: /go/src/github.com/m3db/m3
<<: *common
- name: "Lint"
command: make clean lint
env:
CGO_ENABLED: 0
plugins:
docker-compose#v2.5.1:
run: app
Expand All @@ -47,7 +56,7 @@ steps:
parallelism: 2
env:
CGO_ENABLED: 0
GIMME_GO_VERSION: 1.13.x
GIMME_GO_VERSION: 1.14.x
plugins:
gopath-checkout#v1.0.1:
import: github.com/m3db/m3
Expand All @@ -57,7 +66,7 @@ steps:
parallelism: 1
env:
CGO_ENABLED: 0
GIMME_GO_VERSION: 1.13.x
GIMME_GO_VERSION: 1.14.x
plugins:
gopath-checkout#v1.0.1:
import: github.com/m3db/m3
Expand Down Expand Up @@ -90,7 +99,7 @@ steps:
command: make clean install-vendor-m3 docs-test
env:
CGO_ENABLED: 0
GIMME_GO_VERSION: 1.13.x
GIMME_GO_VERSION: 1.14.x
plugins:
gopath-checkout#v1.0.1:
import: github.com/m3db/m3
Expand Down
2 changes: 1 addition & 1 deletion .ci
9 changes: 0 additions & 9 deletions .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ coverage:
target: auto
threshold: 5%
flags: m3ninx
m3nsch:
target: auto
threshold: 5%
flags: m3nsch
m3em:
target: auto
threshold: 5%
Expand Down Expand Up @@ -79,11 +75,6 @@ coverage:
m3ninx:
paths:
- src/m3ninx/
m3nsch:
paths:
- src/m3nsch/
- src/cmd/services/m3nsch_server
- src/cmd/services/m3nsch_client
m3em:
paths:
- src/m3em/
Expand Down
11 changes: 0 additions & 11 deletions .excludemetalint

This file was deleted.

12 changes: 0 additions & 12 deletions .fossa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,6 @@ analyze:
path: src/cmd/services/m3em_agent/main
options:
allow-unresolved: true
- name: github.com/m3db/m3/src/cmd/services/m3nsch_client/main
type: go
target: github.com/m3db/m3/src/cmd/services/m3nsch_client/main
path: src/cmd/services/m3nsch_client/main
options:
allow-unresolved: true
- name: github.com/m3db/m3/src/cmd/services/m3nsch_server/main
type: go
target: github.com/m3db/m3/src/cmd/services/m3nsch_server/main
path: src/cmd/services/m3nsch_server/main
options:
allow-unresolved: true
- name: github.com/m3db/m3/src/cmd/services/m3query/main
type: go
target: github.com/m3db/m3/src/cmd/services/m3query/main
Expand Down
Loading

0 comments on commit 345a67e

Please sign in to comment.