diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 25410ad..b3956e4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,7 @@ on: pull_request: {} push: branches: - - master + - main # Allow manual runs if needed. workflow_dispatch: {} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fc461ee..d177033 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,7 +5,7 @@ If you'd like to file a bug or a feature request for loglevel, the best option i If you're filing a feature request, please remember: -* Feature requests significantly expanding the scope of loglevel outside the description in [the readme](https://github.com/pimterry/loglevel/blob/master/README.md) will probably be rejected. +* Feature requests significantly expanding the scope of loglevel outside the description in [the readme](https://github.com/pimterry/loglevel/blob/main/README.md) will probably be rejected. * Features that can't be meaningfully implemented in a cross-environment compatible manner won't be implemented. * Please check the previously opened issues to see if somebody else has suggested it first. * Consider submitting a pull request to add the feature instead, if you're confident it fits within the above. @@ -60,12 +60,12 @@ How to make your change and submit it 1. Ensure you have Node.js v14 or later (some tests can run on earlier versions, but the full suite requires this version). 2. Fork loglevel. 3. Clone your fork locally. -4. Create a branch from `master` for your change. +4. Create a branch from `main` for your change. 5. Write some tests in `test/` for your change, as relevant. 6. Make your code changes in `lib/loglevel.js`. 7. Check your code all passes (run `npm test`). If you have issues and need to debug the tests, see the details on ["running tests"](#running-tests) below. 8. Commit your changes. -9. Open a pull request back to `master` in loglevel. +9. Open a pull request back to `main` in loglevel. Running Tests ------------- diff --git a/README.md b/README.md index f6ba988..7afa286 100644 --- a/README.md +++ b/README.md @@ -45,8 +45,8 @@ Alternatively if you just want to grab the file yourself, you can download eithe Finally, if you want to tweak loglevel to your own needs or you immediately need the cutting-edge version, clone this repo and see [Developing & Contributing](#developing--contributing) below for build instructions. -[min]: https://raw.github.com/pimterry/loglevel/master/dist/loglevel.min.js -[max]: https://raw.github.com/pimterry/loglevel/master/dist/loglevel.js +[min]: https://raw.github.com/pimterry/loglevel/main/dist/loglevel.min.js +[max]: https://raw.github.com/pimterry/loglevel/main/dist/loglevel.js [cdn]: https://unpkg.com/loglevel/dist/loglevel.min.js ## Setting it up