Skip to content

Commit

Permalink
chore: move to main for primary branch (#554)
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Dawson <mdawson@devrus.com>
  • Loading branch information
mhdawson committed Mar 15, 2021
1 parent d7952d5 commit 8b01246
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/nodejs-ci-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Node.js CI

on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]

jobs:
build:
Expand Down Expand Up @@ -40,4 +40,4 @@ jobs:
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.github_token }}
parallel-finished: true
parallel-finished: true
2 changes: 1 addition & 1 deletion .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
push:
branches:
- master
- main
name: release-please
jobs:
release-please:
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Use `git rebase` to sync your work from time to time.

```
git fetch upstream
git rebase upstream/master
git rebase upstream/main
```

### Development cycle
Expand Down Expand Up @@ -93,7 +93,7 @@ These are mostly notes for myself.

* Be sure you are starting from a clean slate: `npm run clean && npm install`
* Run standard-version: `npm run release` - this will run the `ci` task
* Push to GitHub: `git push --follow-tags origin master`
* Push to GitHub: `git push --follow-tags origin main`
* Publish to npmjs.com: `npm publish`
* Assuming all goes well, head over to https://github.com/nodeshift/opossum/releases
and update the release with any relevant notes. The generated CHANGELOG.md file should
Expand Down
2 changes: 1 addition & 1 deletion docs/assets/anchor.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
/* eslint-env amd, node */

// https://github.com/umdjs/umd/blob/master/templates/returnExports.js
// https://github.com/umdjs/umd/blob/HEAD/templates/returnExports.js
(function(root, factory) {
'use strict';
if (typeof define === 'function' && define.amd) {
Expand Down

0 comments on commit 8b01246

Please sign in to comment.