diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 65e1e66a9..757c77071 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -73,7 +73,7 @@ make clean ```bash # push your code up to your fork -git push fork master +git push fork main ``` * Make sure to follow our [PR process](https://go-vela.github.io/docs/community/contributing_guidelines/#development-workflow) when opening a pull request diff --git a/.github/README.md b/.github/README.md index 00578e3c3..30a9fd391 100644 --- a/.github/README.md +++ b/.github/README.md @@ -3,7 +3,7 @@ [![license](https://img.shields.io/crates/l/gl.svg)](../LICENSE) [![GoDoc](https://godoc.org/github.com/go-vela/server?status.svg)](https://godoc.org/github.com/go-vela/server) [![Go Report Card](https://goreportcard.com/badge/go-vela/server)](https://goreportcard.com/report/go-vela/server) -[![codecov](https://codecov.io/gh/go-vela/server/branch/master/graph/badge.svg)](https://codecov.io/gh/go-vela/server) +[![codecov](https://codecov.io/gh/go-vela/server/branch/main/graph/badge.svg)](https://codecov.io/gh/go-vela/server) > Vela is in active development and is a pre-release product. > diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index fc1738a88..ecc65e90c 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: [ master ] + branches: [ main ] pull_request: # The branches below must be a subset of the branches above - branches: [ master ] + branches: [ main ] schedule: - cron: '23 1 * * 0' diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 71d077009..9f234a8c7 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,10 +1,10 @@ # name of the action name: publish -# trigger on push events with branch master +# trigger on push events with branch main on: push: - branches: [ master ] + branches: [ main ] # pipeline to execute jobs: diff --git a/queue/redis/redis_test.go b/queue/redis/redis_test.go index 8c37fd3fc..aa1bf1a0f 100644 --- a/queue/redis/redis_test.go +++ b/queue/redis/redis_test.go @@ -15,7 +15,7 @@ import ( ) // The following functions were taken from -// https://github.com/go-vela/sdk-go/blob/master/vela/go +// https://github.com/go-vela/sdk-go/blob/main/vela/go // which is the only reason go-vela/sdk-go is // a dependency for go-vela/server // TODO: consider moving to go-vela/types? diff --git a/queue/redis/route.go b/queue/redis/route.go index fa1a3b4f3..58e10b78f 100644 --- a/queue/redis/route.go +++ b/queue/redis/route.go @@ -22,7 +22,7 @@ func (c *client) Route(w *pipeline.Worker) (string, error) { // if pipline does not specify route information return default // - // https://github.com/go-vela/types/blob/master/constants/queue.go#L10 + // https://github.com/go-vela/types/blob/main/constants/queue.go#L10 if w.Empty() { return constants.DefaultRoute, nil }