diff --git a/.github/workflows/nodejs-ci-action.yml b/.github/workflows/nodejs-ci-action.yml index f1afea80..3471f553 100644 --- a/.github/workflows/nodejs-ci-action.yml +++ b/.github/workflows/nodejs-ci-action.yml @@ -2,9 +2,9 @@ name: Node.js CI on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] jobs: build: @@ -40,4 +40,4 @@ jobs: uses: coverallsapp/github-action@master with: github-token: ${{ secrets.github_token }} - parallel-finished: true \ No newline at end of file + parallel-finished: true diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 5509562e..af6bfdec 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main name: release-please jobs: release-please: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a9cac4af..7fc12e67 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 @@ -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 diff --git a/docs/assets/anchor.js b/docs/assets/anchor.js index f74c2de7..bd6ff3f5 100644 --- a/docs/assets/anchor.js +++ b/docs/assets/anchor.js @@ -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) {