From 400aa851947fe1f80cb847e9f72714b6c9899110 Mon Sep 17 00:00:00 2001 From: David May <1301201+wass3r@users.noreply.github.com> Date: Fri, 16 Sep 2022 14:14:53 -0500 Subject: [PATCH] chore: use main as default (#324) --- .github/workflows/publish.yml | 4 ++-- config.toml | 2 +- content/community/contributing_guidelines/_index.md | 12 ++++++------ content/plugins/registry/_index.md | 2 +- content/plugins/tutorials/_index.md | 2 +- content/plugins/tutorials/bash.md | 2 +- content/plugins/tutorials/go.md | 2 +- content/plugins/tutorials/node.md | 2 +- content/plugins/tutorials/python.md | 2 +- content/plugins/tutorials/ruby.md | 2 +- content/reference/api/admin/build.md | 8 ++++---- content/reference/api/admin/hook.md | 4 ++-- content/reference/api/admin/repo.md | 4 ++-- content/reference/api/build/add.md | 8 ++++---- content/reference/api/build/get.md | 8 ++++---- content/reference/api/build/restart.md | 4 ++-- content/reference/api/build/update.md | 4 ++-- content/reference/api/build/view.md | 4 ++-- content/reference/api/deployment/add.md | 4 ++-- content/reference/api/deployment/get.md | 12 ++++++------ content/reference/api/deployment/view.md | 2 +- content/reference/api/hook/add.md | 4 ++-- content/reference/api/hook/get.md | 4 ++-- content/reference/api/hook/update.md | 2 +- content/reference/api/hook/view.md | 2 +- content/reference/api/pipeline/add.md | 4 ++-- content/reference/api/pipeline/get.md | 4 ++-- content/reference/api/pipeline/templates.md | 4 ++-- content/reference/api/pipeline/update.md | 2 +- content/reference/api/pipeline/view.md | 2 +- content/reference/api/repo/add.md | 2 +- content/reference/api/repo/get.md | 8 ++++---- content/reference/api/repo/update.md | 2 +- content/reference/api/repo/view.md | 2 +- content/reference/api/user/current/repos.md | 4 ++-- content/reference/cli/build/get.md | 10 +++++----- content/reference/cli/build/restart.md | 4 ++-- content/reference/cli/build/view.md | 4 ++-- content/reference/cli/deployment/get.md | 4 ++-- content/reference/cli/deployment/view.md | 2 +- content/reference/cli/hook/get.md | 10 +++++----- content/reference/cli/hook/view.md | 2 +- content/reference/cli/log/get.md | 6 +++--- content/reference/cli/log/view.md | 6 +++--- content/reference/cli/pipeline/get.md | 4 ++-- content/reference/cli/repo/add.md | 2 +- content/reference/cli/repo/get.md | 2 +- content/reference/cli/repo/update.md | 2 +- content/reference/cli/repo/view.md | 2 +- content/reference/yaml/steps.md | 12 ++++++------ content/templates/tutorials/go/conditional.md | 4 ++-- content/templates/tutorials/go/functions.md | 4 ++-- content/templates/tutorials/starlark/conditional.md | 4 ++-- content/tour/cloning.md | 2 +- content/usage/badge.md | 2 +- 55 files changed, 114 insertions(+), 114 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b43c116b9..d124b761e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,11 +1,11 @@ # name of the action name: publish -# trigger on push to master +# trigger on push to main on: push: branches: - - master + - main # pipeline to execute jobs: diff --git a/config.toml b/config.toml index bdaa7d70d..8f0f5b042 100644 --- a/config.toml +++ b/config.toml @@ -49,7 +49,7 @@ anchor = "smart" [params] copyright = "Target Brands" -privacy_policy = "https://github.com/go-vela/server/blob/master/LICENSE" +privacy_policy = "https://github.com/go-vela/server/blob/main/LICENSE" # First one is picked as the Twitter card image if not set on page. # images = ["images/project-illustration.png"] diff --git a/content/community/contributing_guidelines/_index.md b/content/community/contributing_guidelines/_index.md index a9e9bdd21..7dcdebbfb 100644 --- a/content/community/contributing_guidelines/_index.md +++ b/content/community/contributing_guidelines/_index.md @@ -70,9 +70,9 @@ Vela is written in a modular format which creates a dependency tree. The ui is i ### Proposals -[Proposals](https://github.com/go-vela/community/tree/master/proposals) are used to foster discussion around large or breaking feature requests, or when looking for feedback on varied implementation options. Check that an [issue](https://github.com/go-vela/community/issues) or [proposal](https://github.com/go-vela/community/tree/master/proposals) doesn’t exist already. +[Proposals](https://github.com/go-vela/community/tree/main/proposals) are used to foster discussion around large or breaking feature requests, or when looking for feedback on varied implementation options. Check that an [issue](https://github.com/go-vela/community/issues) or [proposal](https://github.com/go-vela/community/tree/main/proposals) doesn’t exist already. -Create a pull request using the [proposal template](https://github.com/go-vela/community/blob/master/.github/PULL_REQUEST_TEMPLATE/proposal.md). +Create a pull request using the [proposal template](https://github.com/go-vela/community/blob/main/.github/PULL_REQUEST_TEMPLATE/proposal.md). Anyone is welcome to weigh in on a proposal. If you’d like, link it in the [public #vela Slack channel](https://gophers.slack.com/app_redirect?channel=CNRRKE8KY) for more visibility. @@ -81,11 +81,11 @@ There isn’t a clearly defined proposal process yet (we’re working on that). ## Lifecycle of a Contribution {{% alert title="Note:" color="warning" %}} -Make sure an [issue](https://github.com/go-vela/community/issues) or [proposal](https://github.com/go-vela/community/tree/master/proposals) in the [go-vela/community](https://github.com/go-vela/community) repository exists prior to beginning any code changes. +Make sure an [issue](https://github.com/go-vela/community/issues) or [proposal](https://github.com/go-vela/community/tree/main/proposals) in the [go-vela/community](https://github.com/go-vela/community) repository exists prior to beginning any code changes. {{% /alert %}} ### Determining appropriateness for Vela -Before contributing any code, make sure an [issue](/docs/community/contributing_guidelines/#issues) exists, be sure to checkout current [issues](https://github.com/go-vela/community/issues) and [proposals](https://github.com/go-vela/community/tree/master/proposals) to make sure your idea isn’t already being worked on. We're working on a public roadmap view to link here. +Before contributing any code, make sure an [issue](/docs/community/contributing_guidelines/#issues) exists, be sure to checkout current [issues](https://github.com/go-vela/community/issues) and [proposals](https://github.com/go-vela/community/tree/main/proposals) to make sure your idea isn’t already being worked on. We're working on a public roadmap view to link here. If an issue does not exist, make sure to create one. @@ -155,7 +155,7 @@ Currently, main releases only apply to [core repos](/docs/community/contributing - [Enhancements](/docs/community/contributing_guidelines/#issues) will be considered on a case-by-case basis by admins. - [Bugs](/docs/community/contributing_guidelines/#issues) and security fixes can be included. - Non-breaking dependency updates can be included. -- **Release Notes:** You can find a list of release notes in the [community repository](https://github.com/go-vela/community/tree/master/releases). +- **Release Notes:** You can find a list of release notes in the [community repository](https://github.com/go-vela/community/tree/main/releases). ## Style Guide As you contribute to Vela, we ask that you follow these style guides to keep the code clean and consistent. @@ -203,5 +203,5 @@ Because Vela is an open source tool, anyone can contribute! We have our admins a If you have a question about contributing to Vela, the above guidelines, or Vela in general, please reach out to the Vela team! - [#vela](https://gophers.slack.com/app_redirect?channel=CNRRKE8KY) Slack channel - Email us at [vela@target.com](mailto:vela@target.com) -- [Support resources](https://github.com/go-vela/ui/blob/master/.github/SUPPORT.md) +- [Support resources](https://github.com/go-vela/ui/blob/main/.github/SUPPORT.md) - Open an [issue](https://github.com/go-vela/community/issues/new/choose) diff --git a/content/plugins/registry/_index.md b/content/plugins/registry/_index.md index e75bb5c42..0a72630cd 100644 --- a/content/plugins/registry/_index.md +++ b/content/plugins/registry/_index.md @@ -6,7 +6,7 @@ description: > --- {{% alert title="Note:" color="primary" %}} -Plugin documentation is rendered directly from their source reposiories `DOCS.md` file on the master branch. If you seek documentation for a specific version please go directly to the plugin repository. +Plugin documentation is rendered directly from their source reposiories `DOCS.md` file on the main branch. If you seek documentation for a specific version please go directly to the plugin repository. * [Pipeline plugins](https://github.com/go-vela?q=plugin&type=&language=) - pattern within go-vela org `vela-` prefixed repositories * [Secret plugins](https://github.com/go-vela?q=secret&type=&language=) - pattern within go-vela org `secret-` prefixed repositories diff --git a/content/plugins/tutorials/_index.md b/content/plugins/tutorials/_index.md index 37325cdac..ab6883dd4 100644 --- a/content/plugins/tutorials/_index.md +++ b/content/plugins/tutorials/_index.md @@ -5,7 +5,7 @@ description: > Learn how to write your own pipeline plugin for Vela. --- -An example of these tutorials exist in our [go-vela/vela-tutorials](https://github.com/go-vela/vela-tutorials/tree/master/plugins) repository. +An example of these tutorials exist in our [go-vela/vela-tutorials](https://github.com/go-vela/vela-tutorials/tree/main/plugins) repository. {{% alert color="warning" %}} We recommend reviewing [Docker's best practices](https://docs.docker.com/develop/develop-images/dockerfile_best-practices/) before attempting to create a custom plugin. diff --git a/content/plugins/tutorials/bash.md b/content/plugins/tutorials/bash.md index 89bb7fc80..665f164c9 100644 --- a/content/plugins/tutorials/bash.md +++ b/content/plugins/tutorials/bash.md @@ -43,7 +43,7 @@ curl \ ``` {{% alert color="info" %}} -An example of this code is provided in the [bash section](https://github.com/go-vela/vela-tutorials/tree/master/plugins/bash) of the [go-vela/vela-tutorials](https://github.com/go-vela/vela-tutorials/tree/master/plugins) repository. +An example of this code is provided in the [bash section](https://github.com/go-vela/vela-tutorials/tree/main/plugins/bash) of the [go-vela/vela-tutorials](https://github.com/go-vela/vela-tutorials/tree/main/plugins) repository. {{% /alert %}} ## Image diff --git a/content/plugins/tutorials/go.md b/content/plugins/tutorials/go.md index 016a7c67a..5286643f8 100644 --- a/content/plugins/tutorials/go.md +++ b/content/plugins/tutorials/go.md @@ -64,7 +64,7 @@ func main() { ``` {{% alert color="info" %}} -An example of this code is provided in the [go section](https://github.com/go-vela/vela-tutorials/tree/master/plugins/go) of the [go-vela/vela-tutorials](https://github.com/go-vela/vela-tutorials/tree/master/plugins) repository. +An example of this code is provided in the [go section](https://github.com/go-vela/vela-tutorials/tree/main/plugins/go) of the [go-vela/vela-tutorials](https://github.com/go-vela/vela-tutorials/tree/main/plugins) repository. {{% /alert %}} ## Executable diff --git a/content/plugins/tutorials/node.md b/content/plugins/tutorials/node.md index ee7cfcb74..f52eefa1f 100644 --- a/content/plugins/tutorials/node.md +++ b/content/plugins/tutorials/node.md @@ -60,7 +60,7 @@ req.end(); ``` {{% alert color="info" %}} -An example of this code is provided in the [node.js section](https://github.com/go-vela/vela-tutorials/tree/master/plugins/node.js) of the [go-vela/vela-tutorials](https://github.com/go-vela/vela-tutorials/tree/master/plugins) repository. +An example of this code is provided in the [node.js section](https://github.com/go-vela/vela-tutorials/tree/main/plugins/node.js) of the [go-vela/vela-tutorials](https://github.com/go-vela/vela-tutorials/tree/main/plugins) repository. {{% /alert %}} ## Image diff --git a/content/plugins/tutorials/python.md b/content/plugins/tutorials/python.md index f4b100172..562c0368a 100644 --- a/content/plugins/tutorials/python.md +++ b/content/plugins/tutorials/python.md @@ -57,7 +57,7 @@ print(response.read().decode("utf-8")) ``` {{% alert color="info" %}} -An example of this code is provided in the [python section](https://github.com/go-vela/vela-tutorials/tree/master/plugins/python) of the [go-vela/vela-tutorials](https://github.com/go-vela/vela-tutorials/tree/master/plugins) repository. +An example of this code is provided in the [python section](https://github.com/go-vela/vela-tutorials/tree/main/plugins/python) of the [go-vela/vela-tutorials](https://github.com/go-vela/vela-tutorials/tree/main/plugins) repository. {{% /alert %}} ## Image diff --git a/content/plugins/tutorials/ruby.md b/content/plugins/tutorials/ruby.md index eebf697e1..240b3f5bf 100644 --- a/content/plugins/tutorials/ruby.md +++ b/content/plugins/tutorials/ruby.md @@ -56,7 +56,7 @@ puts response.read_body ``` {{% alert color="info" %}} -An example of this code is provided in the [ruby section](https://github.com/go-vela/vela-tutorials/tree/master/plugins/ruby) of the [go-vela/vela-tutorials](https://github.com/go-vela/vela-tutorials/tree/master/plugins) repository. +An example of this code is provided in the [ruby section](https://github.com/go-vela/vela-tutorials/tree/main/plugins/ruby) of the [go-vela/vela-tutorials](https://github.com/go-vela/vela-tutorials/tree/main/plugins) repository. {{% /alert %}} ## Image diff --git a/content/reference/api/admin/build.md b/content/reference/api/admin/build.md index 03cd28590..8c65ff76b 100644 --- a/content/reference/api/admin/build.md +++ b/content/reference/api/admin/build.md @@ -63,8 +63,8 @@ curl \ "commit": "48afb5bdc41ad69bf22588491333f7cf71135163", "sender": "OctoKitty", "author": "OctoKitty", - "branch": "master", - "ref": "refs/heads/master", + "branch": "main", + "ref": "refs/heads/main", "base_ref": "", "host": "ed95dcc0687c", "runtime": "", @@ -90,8 +90,8 @@ curl \ "commit": "48afb5bdc41ad69bf22588491333f7cf71135163", "sender": "OctoKitty", "author": "OctoKitty", - "branch": "master", - "ref": "refs/heads/master", + "branch": "main", + "ref": "refs/heads/main", "base_ref": "", "host": "82823eb770b0", "runtime": "", diff --git a/content/reference/api/admin/hook.md b/content/reference/api/admin/hook.md index 69cf08472..4a78114a3 100644 --- a/content/reference/api/admin/hook.md +++ b/content/reference/api/admin/hook.md @@ -52,7 +52,7 @@ curl \ "created": "1563474076", "host": "github.com", "event": "push", - "branch": "master", + "branch": "main", "error": "", "status": "success", "link": "" @@ -66,7 +66,7 @@ curl \ "created": "1563474076", "host": "github.com", "event": "push", - "branch": "master", + "branch": "main", "error": "", "status": "success", "link": "" diff --git a/content/reference/api/admin/repo.md b/content/reference/api/admin/repo.md index 3e9d1113f..589b0f189 100644 --- a/content/reference/api/admin/repo.md +++ b/content/reference/api/admin/repo.md @@ -51,7 +51,7 @@ curl \ "full_name": "github/octocat", "link": "https://github.com/github/octocat", "clone": "https://github.com/github/octocat.git", - "branch": "master", + "branch": "main", "timeout": 60, "visibility": "public", "private": false, @@ -71,7 +71,7 @@ curl \ "full_name": "github/octokitty", "link": "https://github.com/github/octokitty", "clone": "https://github.com/github/octokitty.git", - "branch": "master", + "branch": "main", "timeout": 60, "visibility": "public", "private": false, diff --git a/content/reference/api/build/add.md b/content/reference/api/build/add.md index 112cee817..3b49dd463 100644 --- a/content/reference/api/build/add.md +++ b/content/reference/api/build/add.md @@ -44,12 +44,12 @@ To authenticate to the API, please review the [authentication documentation](/do ```json { "author": "Octokitty", - "branch": "master", + "branch": "main", "commit": "48afb5bdc41ad69bf22588491333f7cf71135163", "clone": "https://github.com/github/octocat.git", "event": "push", "message": "First commit...", - "ref": "refs/heads/master", + "ref": "refs/heads/main", "sender": "Octokitty", "source": "https://github.com/github/octocat/commit/48afb5bdc41ad69bf22588491333f7cf71135163", "title": "push received from https://github.com/github/octocat" @@ -90,8 +90,8 @@ curl \ "commit": "48afb5bdc41ad69bf22588491333f7cf71135163", "sender": "OctoKitty", "author": "OctoKitty", - "branch": "master", - "ref": "refs/heads/master", + "branch": "main", + "ref": "refs/heads/main", "base_ref": "", "host": "company.localhost", "runtime": "docker", diff --git a/content/reference/api/build/get.md b/content/reference/api/build/get.md index 2a9421833..857c82fec 100644 --- a/content/reference/api/build/get.md +++ b/content/reference/api/build/get.md @@ -95,8 +95,8 @@ curl \ "commit": "48afb5bdc41ad69bf22588491333f7cf71135163", "sender": "OctoKitty", "author": "OctoKitty", - "branch": "master", - "ref": "refs/heads/master", + "branch": "main", + "ref": "refs/heads/main", "base_ref": "", "host": "ed95dcc0687c", "runtime": "", @@ -122,8 +122,8 @@ curl \ "commit": "48afb5bdc41ad69bf22588491333f7cf71135163", "sender": "OctoKitty", "author": "OctoKitty", - "branch": "master", - "ref": "refs/heads/master", + "branch": "main", + "ref": "refs/heads/main", "base_ref": "", "host": "82823eb770b0", "runtime": "", diff --git a/content/reference/api/build/restart.md b/content/reference/api/build/restart.md index cdbd447ab..8f6f772a7 100644 --- a/content/reference/api/build/restart.md +++ b/content/reference/api/build/restart.md @@ -72,8 +72,8 @@ curl \ "commit": "48afb5bdc41ad69bf22588491333f7cf71135163", "sender": "OctoKitty", "author": "OctoKitty", - "branch": "master", - "ref": "refs/heads/master", + "branch": "main", + "ref": "refs/heads/main", "base_ref": "", "host": "company.localhost", "runtime": "docker", diff --git a/content/reference/api/build/update.md b/content/reference/api/build/update.md index 9a648a369..90c95ea67 100644 --- a/content/reference/api/build/update.md +++ b/content/reference/api/build/update.md @@ -82,8 +82,8 @@ curl \ "commit": "48afb5bdc41ad69bf22588491333f7cf71135163", "sender": "OctoKitty", "author": "OctoKitty", - "branch": "master", - "ref": "refs/heads/master", + "branch": "main", + "ref": "refs/heads/main", "base_ref": "", "host": "company.localhost", "runtime": "docker", diff --git a/content/reference/api/build/view.md b/content/reference/api/build/view.md index 56123083d..f90e5b843 100644 --- a/content/reference/api/build/view.md +++ b/content/reference/api/build/view.md @@ -72,8 +72,8 @@ curl \ "commit": "48afb5bdc41ad69bf22588491333f7cf71135163", "sender": "OctoKitty", "author": "OctoKitty", - "branch": "master", - "ref": "refs/heads/master", + "branch": "main", + "ref": "refs/heads/main", "base_ref": "", "host": "company.localhost", "runtime": "docker", diff --git a/content/reference/api/deployment/add.md b/content/reference/api/deployment/add.md index 4b13d9244..ff9afc81c 100644 --- a/content/reference/api/deployment/add.md +++ b/content/reference/api/deployment/add.md @@ -43,7 +43,7 @@ To authenticate to the API, please review the [authentication documentation](/do ```json { - "ref": "master", + "ref": "main", "target": "production" } ``` @@ -68,7 +68,7 @@ curl \ "url": "https://api.github.com/repos/github/octocat/deployments/1", "user": "octocat", "commit": "48afb5bdc41ad69bf22588491333f7cf71135163", - "ref": "master", + "ref": "main", "task": "deploy:vela", "target": "production", "description": "Deployment request from Vela" diff --git a/content/reference/api/deployment/get.md b/content/reference/api/deployment/get.md index d7bc6cdd8..986e1774a 100644 --- a/content/reference/api/deployment/get.md +++ b/content/reference/api/deployment/get.md @@ -58,7 +58,7 @@ curl \ "url": "https://api.github.com/repos/github/octocat/deployments/2", "user": "octocat", "commit": "48afb5bdc41ad69bf22588491333f7cf71135163", - "ref": "master", + "ref": "main", "task": "deploy:vela", "target": "production", "description": "Deployment request from Vela", @@ -84,8 +84,8 @@ curl \ "commit": "48afb5bdc41ad69bf22588491333f7cf71135163", "sender": "OctoKitty", "author": "OctoKitty", - "branch": "master", - "ref": "refs/heads/master", + "branch": "main", + "ref": "refs/heads/main", "base_ref": "", "host": "ed95dcc0687c", "runtime": "", @@ -99,7 +99,7 @@ curl \ "url": "https://api.github.com/repos/github/octocat/deployments/9", "user": "octocat", "commit": "48afb5bdc41ad69bf22588491333f7cf71135163", - "ref": "master", + "ref": "main", "task": "deploy:vela", "target": "production", "description": "Deployment request from Vela", @@ -125,8 +125,8 @@ curl \ "commit": "48afb5bdc41ad69bf22588491333f7cf71135163", "sender": "OctoKitty", "author": "OctoKitty", - "branch": "master", - "ref": "refs/heads/master", + "branch": "main", + "ref": "refs/heads/main", "base_ref": "", "host": "82823eb770b0", "runtime": "", diff --git a/content/reference/api/deployment/view.md b/content/reference/api/deployment/view.md index dcfe1f548..ce4a217a6 100644 --- a/content/reference/api/deployment/view.md +++ b/content/reference/api/deployment/view.md @@ -58,7 +58,7 @@ curl \ "url": "https://api.github.com/repos/github/octocat/deployments/1", "user": "octocat", "commit": "48afb5bdc41ad69bf22588491333f7cf71135163", - "ref": "master", + "ref": "main", "task": "deploy:vela", "target": "production", "description": "Deployment request from Vela" diff --git a/content/reference/api/hook/add.md b/content/reference/api/hook/add.md index 101ecc0cc..7686aa16f 100644 --- a/content/reference/api/hook/add.md +++ b/content/reference/api/hook/add.md @@ -47,7 +47,7 @@ To authenticate to the API, please review the [authentication documentation](/do "source_id": "c8da1302-07d6-11ea-882f-4893bca275b8", "host": "github.com", "event": "push", - "branch": "master", + "branch": "main", "status": "success" } ``` @@ -75,7 +75,7 @@ curl \ "created": "1563474076", "host": "github.com", "event": "push", - "branch": "master", + "branch": "main", "error": "", "status": "success", "link": "" diff --git a/content/reference/api/hook/get.md b/content/reference/api/hook/get.md index 7387695bd..77e4bc81e 100644 --- a/content/reference/api/hook/get.md +++ b/content/reference/api/hook/get.md @@ -61,7 +61,7 @@ curl \ "created": "1563474076", "host": "github.com", "event": "push", - "branch": "master", + "branch": "main", "error": "", "status": "success", "link": "" @@ -75,7 +75,7 @@ curl \ "created": "1563474076", "host": "github.com", "event": "push", - "branch": "master", + "branch": "main", "error": "", "status": "success", "link": "" diff --git a/content/reference/api/hook/update.md b/content/reference/api/hook/update.md index 633603f85..3955d4d04 100644 --- a/content/reference/api/hook/update.md +++ b/content/reference/api/hook/update.md @@ -71,7 +71,7 @@ curl \ "created": "1563474076", "host": "github.com", "event": "push", - "branch": "master", + "branch": "main", "error": "", "status": "failure", "link": "" diff --git a/content/reference/api/hook/view.md b/content/reference/api/hook/view.md index beb50feeb..7d7487753 100644 --- a/content/reference/api/hook/view.md +++ b/content/reference/api/hook/view.md @@ -61,7 +61,7 @@ curl \ "created": "1563474076", "host": "github.com", "event": "push", - "branch": "master", + "branch": "main", "error": "", "status": "success", "link": "" diff --git a/content/reference/api/pipeline/add.md b/content/reference/api/pipeline/add.md index ea6e39b77..524e6d3d7 100644 --- a/content/reference/api/pipeline/add.md +++ b/content/reference/api/pipeline/add.md @@ -44,7 +44,7 @@ To authenticate to the API, please review the [authentication documentation](/do ```json { "commit": "48afb5bdc41ad69bf22588491333f7cf71135163", - "ref": "refs/heads/master", + "ref": "refs/heads/main", "type": "yaml", "version": "1", "steps": true, @@ -72,7 +72,7 @@ curl \ "commit": "48afb5bdc41ad69bf22588491333f7cf71135163", "flavor": "", "platform": "", - "ref": "refs/heads/master", + "ref": "refs/heads/main", "type": "yaml", "version": "1", "external_secrets": false, diff --git a/content/reference/api/pipeline/get.md b/content/reference/api/pipeline/get.md index a68f2e7f9..8a33f1428 100644 --- a/content/reference/api/pipeline/get.md +++ b/content/reference/api/pipeline/get.md @@ -61,7 +61,7 @@ curl \ "commit": "a49aaf4afae6431a79239c95247a2b169fd9f067", "flavor": "", "platform": "", - "ref": "refs/heads/master", + "ref": "refs/heads/main", "type": "yaml", "version": "1", "external_secrets": false, @@ -78,7 +78,7 @@ curl \ "commit": "48afb5bdc41ad69bf22588491333f7cf71135163", "flavor": "", "platform": "", - "ref": "refs/heads/master", + "ref": "refs/heads/main", "type": "yaml", "version": "1", "external_secrets": false, diff --git a/content/reference/api/pipeline/templates.md b/content/reference/api/pipeline/templates.md index 54e5168fc..3d16006cb 100644 --- a/content/reference/api/pipeline/templates.md +++ b/content/reference/api/pipeline/templates.md @@ -57,7 +57,7 @@ curl \ ```yaml some_template: - link: https://github.com/github/octocat/blob/master/template.yml + link: https://github.com/github/octocat/blob/main/template.yml name: some_template source: github.com/github/octocat/template.yml type: github @@ -66,7 +66,7 @@ some_template: ```json { "some_template": { - "link": "https://github.com/github/octocat/blob/master/template.yml", + "link": "https://github.com/github/octocat/blob/main/template.yml", "name": "some_template", "source": "github.com/github/octocat/template.yml", "type": "github" diff --git a/content/reference/api/pipeline/update.md b/content/reference/api/pipeline/update.md index b000c0cf6..bacf10131 100644 --- a/content/reference/api/pipeline/update.md +++ b/content/reference/api/pipeline/update.md @@ -68,7 +68,7 @@ curl \ "commit": "48afb5bdc41ad69bf22588491333f7cf71135163", "flavor": "", "platform": "", - "ref": "refs/heads/master", + "ref": "refs/heads/main", "type": "yaml", "version": "1", "external_secrets": false, diff --git a/content/reference/api/pipeline/view.md b/content/reference/api/pipeline/view.md index 56fa328ff..ad7b3fa01 100644 --- a/content/reference/api/pipeline/view.md +++ b/content/reference/api/pipeline/view.md @@ -60,7 +60,7 @@ curl \ "commit": "48afb5bdc41ad69bf22588491333f7cf71135163", "flavor": "", "platform": "", - "ref": "refs/heads/master", + "ref": "refs/heads/main", "type": "yaml", "version": "1", "external_secrets": false, diff --git a/content/reference/api/repo/add.md b/content/reference/api/repo/add.md index 4f16c1c97..002338d97 100644 --- a/content/reference/api/repo/add.md +++ b/content/reference/api/repo/add.md @@ -63,7 +63,7 @@ curl \ "full_name": "github/octocat", "link": "https://github.com/github/octocat", "clone": "https://github.com/github/octocat.git", - "branch": "master", + "branch": "main", "build_limit": 10, "timeout": 60, "counter": 0, diff --git a/content/reference/api/repo/get.md b/content/reference/api/repo/get.md index a90a568e5..be6a6ff34 100644 --- a/content/reference/api/repo/get.md +++ b/content/reference/api/repo/get.md @@ -61,7 +61,7 @@ curl \ "full_name": "github/octocat", "link": "https://github.com/github/octocat", "clone": "https://github.com/github/octocat.git", - "branch": "master", + "branch": "main", "build_limit": 10, "timeout": 60, "counter": 0, @@ -84,7 +84,7 @@ curl \ "full_name": "github/octokitty", "link": "https://github.com/github/octokitty", "clone": "https://github.com/github/octokitty.git", - "branch": "master", + "branch": "main", "build_limit": 10, "timeout": 60, "counter": 0, @@ -167,7 +167,7 @@ curl \ "full_name": "octocat/example", "link": "https://github.com/octocat/example", "clone": "https://github.com/octocat/example.git", - "branch": "master", + "branch": "main", "build_limit": 10, "timeout": 60, "counter": 0, @@ -190,7 +190,7 @@ curl \ "full_name": "octocat/octokitty", "link": "https://github.com/octocat/octokitty", "clone": "https://github.com/octocat/octokitty.git", - "branch": "master", + "branch": "main", "build_limit": 10, "timeout": 60, "counter": 0, diff --git a/content/reference/api/repo/update.md b/content/reference/api/repo/update.md index 69a06668a..0b624078d 100644 --- a/content/reference/api/repo/update.md +++ b/content/reference/api/repo/update.md @@ -69,7 +69,7 @@ curl \ "full_name": "github/octocat", "link": "https://github.com/github/octocat", "clone": "https://github.com/github/octocat.git", - "branch": "master", + "branch": "main", "build_limit": 10, "timeout": 60, "counter": 0, diff --git a/content/reference/api/repo/view.md b/content/reference/api/repo/view.md index 2375ec83b..ce2aab07e 100644 --- a/content/reference/api/repo/view.md +++ b/content/reference/api/repo/view.md @@ -59,7 +59,7 @@ curl \ "full_name": "github/octocat", "link": "https://github.com/github/octocat", "clone": "https://github.com/github/octocat.git", - "branch": "master", + "branch": "main", "build_limit": 10, "timeout": 60, "counter": 0, diff --git a/content/reference/api/user/current/repos.md b/content/reference/api/user/current/repos.md index 72237b3c1..750a3bd7c 100644 --- a/content/reference/api/user/current/repos.md +++ b/content/reference/api/user/current/repos.md @@ -51,7 +51,7 @@ curl \ "full_name": "github/octocat", "link": "https://github.com/github/octocat", "clone": "https://github.com/github/octocat.git", - "branch": "master", + "branch": "main", "timeout": 60, "visibility": "public", "private": false, @@ -71,7 +71,7 @@ curl \ "full_name": "github/octokitty", "link": "https://github.com/github/octokitty", "clone": "https://github.com/github/octokitty.git", - "branch": "master", + "branch": "main", "timeout": 60, "visibility": "public", "private": false, diff --git a/content/reference/cli/build/get.md b/content/reference/cli/build/get.md index d50ca0667..18de3235c 100644 --- a/content/reference/cli/build/get.md +++ b/content/reference/cli/build/get.md @@ -72,9 +72,9 @@ $ vela get build --org github --repo octocat --build 1 ```sh NUMBER STATUS EVENT BRANCH DURATION -5 failure push master 45s -4 failure push master 50s -3 success push master 54s -2 success push master 55s -1 pending push master ... +5 failure push main 45s +4 failure push main 50s +3 success push main 54s +2 success push main 55s +1 pending push main ... ``` diff --git a/content/reference/cli/build/restart.md b/content/reference/cli/build/restart.md index c846d3e5c..5493edf98 100644 --- a/content/reference/cli/build/restart.md +++ b/content/reference/cli/build/restart.md @@ -86,8 +86,8 @@ message: First commit... commit: 48afb5bdc41ad69bf22588491333f7cf71135163 sender: OctoKitty author: OctoKitty -branch: master -ref: refs/heads/master +branch: main +ref: refs/heads/main baseref: "" host: "company.localhost" runtime: "docker" diff --git a/content/reference/cli/build/view.md b/content/reference/cli/build/view.md index 632410833..f25710326 100644 --- a/content/reference/cli/build/view.md +++ b/content/reference/cli/build/view.md @@ -86,8 +86,8 @@ message: First commit... commit: 48afb5bdc41ad69bf22588491333f7cf71135163 sender: OctoKitty author: OctoKitty -branch: master -ref: refs/heads/master +branch: main +ref: refs/heads/main baseref: "" host: "company.localhost" runtime: "docker" diff --git a/content/reference/cli/deployment/get.md b/content/reference/cli/deployment/get.md index 4a12a2fd1..29c52174d 100644 --- a/content/reference/cli/deployment/get.md +++ b/content/reference/cli/deployment/get.md @@ -64,8 +64,8 @@ $ vela get deployment --org github --repo octocat #### Response generated from successful CLI command ```sh ID TASK USER REF TARGET -2 deploy:vela octocat master production -1 deploy:vela octocat master production +2 deploy:vela octocat main production +1 deploy:vela octocat main production ``` ## Examples diff --git a/content/reference/cli/deployment/view.md b/content/reference/cli/deployment/view.md index 02fd17cb0..6cdbf1e12 100644 --- a/content/reference/cli/deployment/view.md +++ b/content/reference/cli/deployment/view.md @@ -67,7 +67,7 @@ repo_id: 1 url: https://api.github.com/repos/github/octocat/deployments/1 user: octocat commit: 48afb5bdc41ad69bf22588491333f7cf71135163 -ref: master +ref: main task: deploy:vela target: production description: Deployment request from Vela diff --git a/content/reference/cli/hook/get.md b/content/reference/cli/hook/get.md index 2d5d1c8f0..4a1c6c1ad 100644 --- a/content/reference/cli/hook/get.md +++ b/content/reference/cli/hook/get.md @@ -69,9 +69,9 @@ $ vela get hook --org github --repo octocat ```sh NUMBER STATUS EVENT BRANCH -5 failure push master -4 failure push master -3 success push master -2 success push master -1 success push master +5 failure push main +4 failure push main +3 success push main +2 success push main +1 success push main ``` diff --git a/content/reference/cli/hook/view.md b/content/reference/cli/hook/view.md index c2f65d684..82be6734b 100644 --- a/content/reference/cli/hook/view.md +++ b/content/reference/cli/hook/view.md @@ -75,7 +75,7 @@ source_id: c8da1302-07d6-11ea-882f-4893bca275b8 created: 1563475419 host: github.com event: push -branch: master +branch: main error: status: success link: https://github.com/github/octocat/settings/hooks/1 diff --git a/content/reference/cli/log/get.md b/content/reference/cli/log/get.md index 58afa1d57..c9c610f76 100644 --- a/content/reference/cli/log/get.md +++ b/content/reference/cli/log/get.md @@ -73,10 +73,10 @@ $ git remote add origin https://github.com/github/octocat.git $ git remote --verbose origin https://github.com/github/octocat.git (fetch) origin https://github.com/github/octocat.git (push) -$ git fetch --no-tags origin refs/heads/master +$ git fetch --no-tags origin refs/heads/main From https://github.com/github/octocat - * branch master -> FETCH_HEAD - * [new branch] master -> origin/master + * branch main -> FETCH_HEAD + * [new branch] main -> origin/main $ git reset --hard afafce5e33a8efd4340613b31a953107d6dec3a3 HEAD is now at afafce5 Dummy commit diff --git a/content/reference/cli/log/view.md b/content/reference/cli/log/view.md index 641f4bf41..64086d8e9 100644 --- a/content/reference/cli/log/view.md +++ b/content/reference/cli/log/view.md @@ -75,10 +75,10 @@ $ git remote add origin https://github.com/github/octocat.git $ git remote --verbose origin https://github.com/github/octocat.git (fetch) origin https://github.com/github/octocat.git (push) -$ git fetch --no-tags origin refs/heads/master +$ git fetch --no-tags origin refs/heads/main From https://github.com/github/octocat - * branch master -> FETCH_HEAD - * [new branch] master -> origin/master + * branch main -> FETCH_HEAD + * [new branch] main -> origin/main $ git reset --hard afafce5e33a8efd4340613b31a953107d6dec3a3 HEAD is now at afafce5 Dummy commit ``` diff --git a/content/reference/cli/pipeline/get.md b/content/reference/cli/pipeline/get.md index 07f2816d4..103a8e2e3 100644 --- a/content/reference/cli/pipeline/get.md +++ b/content/reference/cli/pipeline/get.md @@ -69,6 +69,6 @@ $ vela get pipeline --org github --repo octocat ```sh COMMIT REF TYPE VERSION STAGES STEPS -a49aaf4afae6431a79239c95247a2b169fd9f067 refs/heads/master yaml 1 f t -48afb5bdc41ad69bf22588491333f7cf71135163 refs/heads/master yaml 1 f t +a49aaf4afae6431a79239c95247a2b169fd9f067 refs/heads/main yaml 1 f t +48afb5bdc41ad69bf22588491333f7cf71135163 refs/heads/main yaml 1 f t ``` diff --git a/content/reference/cli/repo/add.md b/content/reference/cli/repo/add.md index 22ec8eb09..171cc5bbc 100644 --- a/content/reference/cli/repo/add.md +++ b/content/reference/cli/repo/add.md @@ -85,7 +85,7 @@ name: octocat fullname: github/octocat link: https://github.com/github/octocat clone: https://github.com/github/octocat.git -branch: master +branch: main buildlimit: 10 timeout: 60 timeout: 0 diff --git a/content/reference/cli/repo/get.md b/content/reference/cli/repo/get.md index b0a4fd32d..ce3ba83a6 100644 --- a/content/reference/cli/repo/get.md +++ b/content/reference/cli/repo/get.md @@ -61,5 +61,5 @@ vela get repos ```sh ORG/REPO STATUS EVENTS VISIBILITY BRANCH -github/octocat true push,pull_request public master +github/octocat true push,pull_request public main ``` diff --git a/content/reference/cli/repo/update.md b/content/reference/cli/repo/update.md index 44519d93a..e482bd516 100644 --- a/content/reference/cli/repo/update.md +++ b/content/reference/cli/repo/update.md @@ -85,7 +85,7 @@ name: octocat fullname: github/octocat link: https://github.com/github/octocat clone: https://github.com/github/octocat.git -branch: master +branch: main buildlimit: 10 timeout: 60 counter: 0 diff --git a/content/reference/cli/repo/view.md b/content/reference/cli/repo/view.md index a6ef9e8a6..1c40a0f7b 100644 --- a/content/reference/cli/repo/view.md +++ b/content/reference/cli/repo/view.md @@ -73,7 +73,7 @@ name: octocat fullname: github/octocat link: https://github.com/github/octocat clone: https://github.com/github/octocat.git -branch: master +branch: main buildlimit: 10 timeout: 60 counter: 0 diff --git a/content/reference/yaml/steps.md b/content/reference/yaml/steps.md index e36090005..c831a49aa 100644 --- a/content/reference/yaml/steps.md +++ b/content/reference/yaml/steps.md @@ -135,8 +135,8 @@ The following rules can be used to configure a ruleset: steps: - ruleset: # As shown below this step will execute if the build - # branch is stage or master. - branch: [ stage, master ] + # branch is stage or main. + branch: [ stage, main ] ``` ```yaml @@ -260,9 +260,9 @@ steps: steps: - ruleset: # As shown below this will tell the ruleset to only execute - # this step when the branch is master and event is push. + # this step when the branch is main and event is push. if: - branch: master + branch: main event: push ``` @@ -271,9 +271,9 @@ steps: steps: - ruleset: # As shown below this will overwrite Vela's default behavior to tell the ruleset - # to only execute this step when the branch is not master and event is not push. + # to only execute this step when the branch is not main and event is not push. unless: - branch: master + branch: main event: push ``` diff --git a/content/templates/tutorials/go/conditional.md b/content/templates/tutorials/go/conditional.md index 1880c6ae3..359168fdc 100644 --- a/content/templates/tutorials/go/conditional.md +++ b/content/templates/tutorials/go/conditional.md @@ -51,8 +51,8 @@ steps: ruleset: event: [ push, pull_request ] - # if branch equals master add this step to the final pipeline - {{ if (eq $br "master") }} + # if branch equals main add this step to the final pipeline + {{ if (eq $br "main") }} - name: build commands: diff --git a/content/templates/tutorials/go/functions.md b/content/templates/tutorials/go/functions.md index e81dfe3c7..3765d17c1 100644 --- a/content/templates/tutorials/go/functions.md +++ b/content/templates/tutorials/go/functions.md @@ -60,7 +60,7 @@ steps: vars: ruleset: event: [ push, pull_request ] - branch: [ master ] + branch: [ main ] ``` `github.com///path/to/file/