Skip to content

Commit dea49d5

Browse files
authored
Fix a typo and a grammar error (#5242)
Signed-off-by: Doğukan Teber <[email protected]>
1 parent 22f6f0c commit dea49d5

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

docs/contributing/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ You are welcome to create draft PRs at any stage of readiness - this
1515
can be helpful to ask for assistance or to develop an idea. But before
1616
a piece of work is finished it should:
1717

18-
* Be organised into one or more commits, each of which has a commit message that describes all changes made in that commit ('why' more than 'what' - we can read the diffs to see the code that changed).
18+
* Be organized into one or more commits, each of which has a commit message that describes all changes made in that commit ('why' more than 'what' - we can read the diffs to see the code that changed).
1919
* Each commit should build towards the whole - don't leave in back-tracks and mistakes that you later corrected.
2020
* Have unit and/or [integration](./how-integration-tests-work.md) tests for new functionality or tests that would have caught the bug being fixed.
2121
* Include a CHANGELOG message if users of Cortex need to hear about what you did.
@@ -60,7 +60,7 @@ To run the integration tests suite please see "[How integration tests work](./ho
6060

6161
### Dependency management
6262

63-
We uses [Go modules](https://golang.org/cmd/go/#hdr-Modules__module_versions__and_more) to manage dependencies on external packages.
63+
We use [Go modules](https://golang.org/cmd/go/#hdr-Modules__module_versions__and_more) to manage dependencies on external packages.
6464
This requires a working Go environment with version 1.11 or greater, git and [bzr](http://wiki.bazaar.canonical.com/Download) installed.
6565

6666
To add or update a new dependency, use the `go get` command:

docs/contributing/how-to-update-the-build-image.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ The build image currently can only be updated by a Cortex maintainer. If you're
1010
1. Update `build-image/Dockerfile`
1111
1. Run `go env` and make sure `GOPROXY=https://proxy.golang.org,direct` (Go's default). Some environment may required `GOPROXY=direct`, and if you push a build image with this, build workflow on GitHub will take a lot longer to download modules.
1212
1. `docker login quay.io`. Note that pushing to `quay.io/cortexproject/build-image` repository can only be done by a maintainer.
13-
1. Build the and publish the image by using `make push-multiarch-build-image`. This will build and push multiplatform docker image (for linux/amd64 and linux/arm64). Running this step successfully requires [Docker Buildx](https://docs.docker.com/buildx/working-with-buildx/), but does not require a specific platform.
13+
1. Build the and publish the image by using `make push-multiarch-build-image`. This will build and push multi-platform docker image (for linux/amd64 and linux/arm64). Running this step successfully requires [Docker Buildx](https://docs.docker.com/buildx/working-with-buildx/), but does not require a specific platform.
1414
1. Replace the image tag in `.github/workflows/*` (_there may be multiple references_) and Makefile (variable `LATEST_BUILD_IMAGE_TAG`).
1515
1. If you are updating Go's runtime version be sure to change `actions/setup-go`'s `go-version` in ``.github/workflows/*`.
1616
1. Open a PR and make sure the CI with new build-image passes

0 commit comments

Comments
 (0)