diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 65957f23e9..f838773fbe 100644 --- a/.github/ISSUE_TEMPLATE/bug.yml +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -8,7 +8,7 @@ body: attributes: label: Pre-flight checklist options: - - label: I have read the [contribution documentation](https://github.com/electron-userland/electron-forge/blob/master/CONTRIBUTING.md) for this project. + - label: I have read the [contribution documentation](https://github.com/electron-userland/electron-forge/blob/main/CONTRIBUTING.md) for this project. required: true - label: I agree to follow the [code of conduct](https://github.com/electron/electron/blob/main/CODE_OF_CONDUCT.md) that this project uses. required: true diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 4f7912d333..2425044608 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -8,7 +8,7 @@ body: attributes: label: Pre-flight checklist options: - - label: I have read the [contribution documentation](https://github.com/electron-userland/electron-forge/blob/master/CONTRIBUTING.md) for this project. + - label: I have read the [contribution documentation](https://github.com/electron-userland/electron-forge/blob/main/CONTRIBUTING.md) for this project. required: true - label: I agree to follow the [code of conduct](https://github.com/electron/electron/blob/main/CODE_OF_CONDUCT.md) that this project uses. required: true diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index a564a3b34b..46706a848f 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -3,8 +3,8 @@ Thanks for filing a pull request! Please check off all of the steps as they are completed by replacing [ ] with [x]. --> -- [ ] I have read the [contribution documentation](https://github.com/electron-userland/electron-forge/blob/master/CONTRIBUTING.md) for this project. -- [ ] I agree to follow the [code of conduct](https://github.com/electron/electron/blob/master/CODE_OF_CONDUCT.md) that this project follows, as appropriate. +- [ ] I have read the [contribution documentation](https://github.com/electron-userland/electron-forge/blob/main/CONTRIBUTING.md) for this project. +- [ ] I agree to follow the [code of conduct](https://github.com/electron/electron/blob/main/CODE_OF_CONDUCT.md) that this project follows, as appropriate. - [ ] The changes are appropriately documented (if applicable). - [ ] The changes have sufficient test coverage (if applicable). - [ ] The testsuite passes successfully on my local machine (if applicable). diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 922a169b22..28dd5bec06 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: CI on: push: branches: - - master + - main tags: - v[0-9]+.[0-9]+.[0-9]+* pull_request: diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 2536d74820..cccc8ac45e 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -3,7 +3,7 @@ name: GitHub Pages on: push: branches: - - master + - main jobs: deploy: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 743aa7c33e..54b38a9283 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -27,7 +27,7 @@ sites](https://github.com/electron/electron#community). ### Debugging Troubleshooting suggestions can be found in the [support -documentation](https://github.com/electron-userland/electron-forge/blob/master/SUPPORT.md#troubleshooting). +documentation](https://github.com/electron-userland/electron-forge/blob/main/SUPPORT.md#troubleshooting). ## Contribution suggestions diff --git a/README.md b/README.md index 898c9cdec7..272dd54a0c 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Build Status](https://github.com/electron-userland/electron-forge/workflows/CI/badge.svg)](https://github.com/electron-userland/electron-forge/actions?query=workflow:CI) [![Discord](https://img.shields.io/discord/745037351163527189?color=blueviolet&logo=discord)](https://discord.com/invite/APGC3k5yaH) [![npm version](https://img.shields.io/npm/v/@electron-forge/cli)](https://npm.im/@electron-forge/cli) -[![license](https://img.shields.io/github/license/electron-userland/electron-forge.svg)](https://github.com/electron-userland/electron-forge/blob/master/LICENSE) +[![license](https://img.shields.io/github/license/electron-userland/electron-forge.svg)](https://github.com/electron-userland/electron-forge/blob/main/LICENSE) ![status](https://img.shields.io/badge/Status-%20Ready%20for%20Awesome-red.svg) A complete tool for building modern Electron applications. @@ -18,7 +18,7 @@ jump right in to Electron development. :building_construction: -The `master` branch is a rewrite of Electron Forge that will eventually be the 6.x series. If you +The `main` branch is a rewrite of Electron Forge that will eventually be the 6.x series. If you are looking for the 5.x series (the version currently published to NPM under `electron-forge`), please view the [5.x branch](https://github.com/electron-userland/electron-forge/tree/5.x). --- @@ -27,9 +27,9 @@ are looking for the 5.x series (the version currently published to NPM under `el [Goals](#project-goals) | [Docs and Usage](#docs-and-usage) | [Configuration](https://www.electronforge.io/configuration) | -[Support](https://github.com/electron-userland/electron-forge/blob/master/SUPPORT.md) | -[Contributing](https://github.com/electron-userland/electron-forge/blob/master/CONTRIBUTING.md) | -[Changelog](https://github.com/electron-userland/electron-forge/blob/master/CHANGELOG.md) +[Support](https://github.com/electron-userland/electron-forge/blob/main/SUPPORT.md) | +[Contributing](https://github.com/electron-userland/electron-forge/blob/main/CONTRIBUTING.md) | +[Changelog](https://github.com/electron-userland/electron-forge/blob/main/CHANGELOG.md) # Getting Started diff --git a/packages/template/base/tmpl/_appveyor.yml b/packages/template/base/tmpl/_appveyor.yml index e161f0d233..ed01dd8a0f 100644 --- a/packages/template/base/tmpl/_appveyor.yml +++ b/packages/template/base/tmpl/_appveyor.yml @@ -8,7 +8,7 @@ cache: - node_modules branches: only: - - master + - main - /^v\d+\.\d+\.\d+/ install: - ps: Install-Product node $env:nodejs_version $env:platform