Skip to content

Commit

Permalink
chore: migrate master to main
Browse files Browse the repository at this point in the history
  • Loading branch information
georgexu99 committed Oct 6, 2022
1 parent 1cd68e3 commit f9d5e52
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CI
on:
push:
branches:
- master
- main
tags:
- v[0-9]+.[0-9]+.[0-9]+*
pull_request:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: GitHub Pages
on:
push:
branches:
- master
- main

jobs:
deploy:
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -67,7 +67,7 @@ bolt build

### Making Commits

Please ensure that all changes are committed using [semantic commit messages](https://github.com/bcoe/conventional-changelog-standard/blob/master/convention.md).
Please ensure that all changes are committed using [semantic commit messages](https://github.com/bcoe/conventional-changelog-standard/blob/main/convention.md).
We expose a helper (`bolt commit`) to make this easier.

### Running the Tests
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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).

---
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions packages/maker/flatpak/src/Config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export interface MakerFlatpakOptionsConfig {
/**
* Release branch of the flatpak, used in the branch field of a flatpak-builder manifest.
*
* Default: master
* Default: main
*/
branch?: string;
/**
Expand All @@ -34,7 +34,7 @@ export interface MakerFlatpakOptionsConfig {
/**
* Base app version, used in the base-version field of a flatpak-builder manifest.
*
* Default: master
* Default: main
*/
baseVersion?: string;
/**
Expand Down
2 changes: 1 addition & 1 deletion packages/template/base/tmpl/_appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f9d5e52

Please sign in to comment.