Skip to content

Commit

Permalink
Merge branch 'master' into braskin/hugo_site
Browse files Browse the repository at this point in the history
Signed-off-by: ChrisChinchilla <[email protected]>

# Conflicts:
#	docs/content/coordinator/_index.md
#	docs/content/coordinator/api/remote.md
#	docs/content/how_to/query.md
#	docs/content/m3query/api/query.md
#	docs/content/m3query/architecture/_index.md
#	docs/content/m3query/architecture/blocks.md
#	docs/content/m3query/architecture/fanout.md
#	docs/content/m3query/config/annotated_config.md
#	docs/content/m3query/config/annotated_config.yaml
#	docs/content/m3query/roadmap.md
#	docs/content/operational_guide/bootstrapping_crash_recovery.md
#	docs/content/operational_guide/monitoring.md
#	docs/content/operational_guide/repairs.md
#	docs/content/operational_guide/upgrading_m3.md
#	docs/content/overview/components.md
#	docs/coordinator/api/remote.md
#	docs/includes/headers_optional_read_all.md
#	docs/includes/headers_optional_read_limits.md
#	docs/includes/headers_optional_write_all.md
#	docs/index.md
#	docs/m3coordinator/api/remote.md
#	docs/m3db/architecture/storage.md
#	docs/m3query/api/index.md
#	docs/m3query/architecture/blocks.md
#	docs/m3query/architecture/fanout.md
#	docs/m3query/architecture/functions.md
#	docs/m3query/config/annotated_config.md
#	docs/m3query/config/annotated_config.yaml
#	docs/m3query/roadmap.md
#	docs/operational_guide/index.md
#	docs/operational_guide/mapping_rollup.md
#	docs/overview/media.md
#	docs/query_engine/api/index.md
#	docs/query_engine/architecture/blocks.md
#	docs/query_engine/architecture/fanout.md
#	docs/query_engine/config/annotated_config.md
#	docs/query_engine/config/annotated_config.yaml
#	docs/query_engine/roadmap.md
#	docs/static/aggregator.md
  • Loading branch information
ChrisChinchilla committed Sep 16, 2020
2 parents febe502 + 47bd03b commit 356abb8
Show file tree
Hide file tree
Showing 1,192 changed files with 82,281 additions and 22,152 deletions.
6 changes: 6 additions & 0 deletions .buildkite/hooks/pre-checkout
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash

set -eo pipefail

echo "--- :git: cleaning checkout"
chmod -R +w ./_tools
1 change: 1 addition & 0 deletions .buildkite/hooks/pre-exit
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
set -eo pipefail

echo "--- :git: cleaning checkout"
chmod -R +w ./_tools || true
git clean -dffx
4 changes: 2 additions & 2 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.12.x
GIMME_GO_VERSION: 1.13.x
plugins:
gopath-checkout#v1.0.1:
import: github.com/m3db/m3
Expand Down Expand Up @@ -90,7 +90,7 @@ steps:
command: make clean install-vendor-m3 docs-test
env:
CGO_ENABLED: 0
GIMME_GO_VERSION: 1.12.x
GIMME_GO_VERSION: 1.13.x
plugins:
gopath-checkout#v1.0.1:
import: github.com/m3db/m3
Expand Down
6 changes: 3 additions & 3 deletions .buildkite/scripts/docs_push.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ rm -rf site
# NB(schallert): if updating this build step or the one below be sure to update
# the docs-build make target (see note there as to why we can't share code
# between the two).
mkdocs build -e docs/theme -t material
mkdocs build -t material
mkdocs gh-deploy --force --dirty

# We do two builds to ensure any behavior of gh-deploy doesn't impact the second
# build.
rm -rf site
mkdocs build -e docs/theme -t material
mkdocs build -t material

git checkout -t origin/docs
# Trying to commit 0 changes would fail, so let's check if there's any changes
Expand All @@ -48,7 +48,7 @@ git clone [email protected]:m3db/m3db-operator.git

(
cd m3db-operator
mkdocs build -e docs/theme -t material
mkdocs build -t material
)

if diff -qr m3db-operator/site m3db.io; then
Expand Down
2 changes: 1 addition & 1 deletion .ci
Submodule .ci updated 1 files
+167 −20 codecov.sh
30 changes: 28 additions & 2 deletions .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,57 @@ coverage:

status:
project:
default: on
default:
target: auto
threshold: 5%
x:
target: auto
threshold: 5%
flags: x
cluster:
target: auto
threshold: 5%
flags: cluster
msg:
target: auto
threshold: 5%
flags: msg
metrics:
target: auto
threshold: 5%
flags: metrics
aggregator:
target: auto
threshold: 5%
flags: aggregator
collector:
target: auto
threshold: 5%
flags: collector
query:
target: auto
threshold: 5%
flags: query
dbnode:
target: auto
threshold: 5%
flags: dbnode
m3ninx:
target: auto
threshold: 5%
flags: m3ninx
m3nsch:
target: auto
threshold: 5%
flags: m3nsch
m3em:
target: auto
threshold: 5%
flags: m3em
patch:
default: on
default:
target: auto
threshold: 5%
changes:
default: off

Expand Down
6 changes: 3 additions & 3 deletions .fossa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ analyze:
path: src/cmd/services/m3coordinator/main
options:
allow-unresolved: true
- name: github.com/m3db/m3/src/cmd/services/m3ctl/main
- name: github.com/m3db/m3/src/cmd/services/r2ctl/main
type: go
target: github.com/m3db/m3/src/cmd/services/m3ctl/main
path: src/cmd/services/m3ctl/main
target: github.com/m3db/m3/src/cmd/services/r2ctl/main
path: src/cmd/services/r2ctl/main
options:
allow-unresolved: true
- name: github.com/m3db/m3/src/cmd/services/m3dbnode/main
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
.DS_Store
test.log

# glide manages this
# go modules manages this
vendor/

# Build binaries
Expand Down Expand Up @@ -52,7 +52,7 @@ yarn-error.log*
# Used to serve m3db.io site
!m3db.io/**/*.html
!m3db.io/**/*.xml
# glide does not manage this
# go modules does not manage this
!m3db.io/**/vendor
# Automatically populated from asset sources
m3db.io/openapi
Expand Down
19 changes: 11 additions & 8 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ builds:
- darwin
# Issue #692 tracks Windows support.
# - windows
goarch:
- amd64
- id: m3aggregator
main: ./src/cmd/services/m3aggregator/main/main.go
binary: m3aggregator
Expand All @@ -74,14 +76,15 @@ builds:
# - windows
goarch:
- amd64
archive:
wrap_in_directory: true
format_overrides:
- goos: windows
format: zip
files:
- LICENSE
- README.md
archives:
- format: tar.gz
wrap_in_directory: true
format_overrides:
- goos: windows
format: zip
files:
- LICENSE
- README.md
release:
github:
owner: m3db
Expand Down
Loading

0 comments on commit 356abb8

Please sign in to comment.