diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 23ca9bbc7cc6..633e6896faa5 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -4,7 +4,8 @@ on: push: branches: - master - - main + # TODO(ldez): remove master and uncomment the next line when v2 will be released. + # - main jobs: diff --git a/.github/workflows/post-release.yml b/.github/workflows/post-release.yml index 19b604ece9fc..94926d213560 100644 --- a/.github/workflows/post-release.yml +++ b/.github/workflows/post-release.yml @@ -29,7 +29,7 @@ jobs: - name: Create Pull Request uses: peter-evans/create-pull-request@v7 with: - base: master + base: main token: ${{ secrets.GOLANGCI_LINT_TOKEN }} branch-suffix: timestamp title: "docs: update GitHub Action assets" @@ -58,7 +58,7 @@ jobs: - name: Create Pull Request uses: peter-evans/create-pull-request@v7 with: - base: master + base: main token: ${{ secrets.GOLANGCI_LINT_TOKEN }} branch-suffix: timestamp title: "docs: update documentation assets" diff --git a/docs/gatsby-node.js b/docs/gatsby-node.js index ab45dd5ac465..361bee653a7a 100644 --- a/docs/gatsby-node.js +++ b/docs/gatsby-node.js @@ -102,7 +102,7 @@ exports.createPages = ({ graphql, actions: { createPage }, reporter }) => { const githubEditUrl = githubUrl && - `${githubUrl}/tree/master/${baseDir}/${docsPath}/${relativePath}`; + `${githubUrl}/tree/main/${baseDir}/${docsPath}/${relativePath}`; const currentPageIndex = listOfItems.findIndex( (page) => page.link === slug diff --git a/docs/src/docs/contributing/website.mdx b/docs/src/docs/contributing/website.mdx index 428ea9620e29..60e32a7c7433 100644 --- a/docs/src/docs/contributing/website.mdx +++ b/docs/src/docs/contributing/website.mdx @@ -37,7 +37,7 @@ It runs script `scripts/website/expand_templates/` that rewrites `mdx` files wit We use GitHub Pages as static website hosting and CD. -GitHub deploys the website to production after merging anything to a `master` branch. +GitHub deploys the website to production after merging anything to a `main` branch. ## Local Testing diff --git a/docs/src/docs/contributing/workflow.mdx b/docs/src/docs/contributing/workflow.mdx index 7bb8afa4a474..14a9ae48b180 100644 --- a/docs/src/docs/contributing/workflow.mdx +++ b/docs/src/docs/contributing/workflow.mdx @@ -41,7 +41,7 @@ Add your new or updated parameters to `.golangci.next.reference.yml` so they wil ## Submit a pull request Push your branch to your `golangci-lint` fork and open a pull request against the -`master` branch. +`main` branch. ## Pull request checks