Skip to content

Commit

Permalink
Rename master branch to main
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Anderson committed Jun 16, 2020
1 parent 6fa74e0 commit a07434e
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Build/release
on:
push:
branches:
- master
- main

jobs:
build:
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
- name: Check out Git repository
uses: actions/checkout@v2
with:
ref: "master"
ref: "main"
- name: Install Node.js, NPM and Yarn
uses: actions/setup-node@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ requests and will give you the 'Thorium-Sim' badge on your Github Profile.
All pull requests and issues are welcome, with the following requirements:

- Pull requests should branch from `develop` and target the `develop` branch,
following the git-flow pattern. Releases will be merged into `master` and
following the git-flow pattern. Releases will be merged into `main` and
released at least weekly from the changes in the `develop` branch.
- Unless the pull request is a small one-off feature or bug fix, the pull
request should reference an issue. If you are intending to start working on a
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
![Thorium](github-banner.png)

![Test](https://github.com/Thorium-Sim/thorium/workflows/Test/badge.svg?branch=master)
![Test](https://github.com/Thorium-Sim/thorium/workflows/Test/badge.svg?branch=main)
[![Discord](https://img.shields.io/discord/390968011605147648.svg)](https://discord.gg/UvxTQZz)
[![All Contributors](https://img.shields.io/badge/all_contributors-20-orange.svg?style=flat-square)](#contributors)
![Version](https://img.shields.io/github/package-json/v/thorium-sim/thorium)
Expand Down
27 changes: 20 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@
},
"proxy": "http://localhost:3001",
"nodemonConfig": {
"watch": ["server/"],
"watch": [
"server/"
],
"ignore": [
".git",
"./src/*",
Expand All @@ -88,8 +90,12 @@
}
},
"lint-staged": {
"*.{js,jsx,ts,tsx}": ["eslint"],
"*.{css,scss}": ["stylelint"],
"*.{js,jsx,ts,tsx}": [
"eslint"
],
"*.{css,scss}": [
"stylelint"
],
"**/*.+(js|jsx|json|yml|yaml|css|less|scss|ts|tsx|md|mdx|graphql|vue)": [
"prettier --write"
]
Expand All @@ -106,7 +112,9 @@
"directories": {
"output": "./packages"
},
"publish": { "provider": "github" },
"publish": {
"provider": "github"
},
"files": [
"electron/**/*",
"!**/node_modules/**/*",
Expand Down Expand Up @@ -135,10 +143,15 @@
]
},
"win": {
"target": ["zip", "portable"],
"target": [
"zip",
"portable"
],
"icon": "./public/icon.ico"
},
"linux": { "category": "Utility" }
"linux": {
"category": "Utility"
}
},
"bin": "./server/index.js",
"pkg": {
Expand All @@ -158,7 +171,7 @@
]
},
"release": {
"branch": "master",
"branch": "main",
"tagFormat": "${version}",
"plugins": [
"@semantic-release/commit-analyzer",
Expand Down

0 comments on commit a07434e

Please sign in to comment.