From 89e6b3970e623490c28adffa3e6c5cd080312c7d Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Tue, 12 Dec 2023 12:15:46 -0600 Subject: [PATCH] rename references to master to main --- .github/workflows/ci.yml | 8 ++++---- CONTRIBUTING.md | 26 +++++++++++++------------- Directory.Build.props | 4 ++-- README.md | 4 ++-- docs/index.md | 4 ++-- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0cb5752..d2aca02 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,10 +3,10 @@ name: CI on: push: branches: - - master + - main pull_request: branches: - - master + - main permissions: contents: read @@ -28,7 +28,7 @@ jobs: run: dotnet fsi build.fsx - name: Upload documentation - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/main' uses: actions/upload-pages-artifact@v1 with: path: ./output @@ -36,7 +36,7 @@ jobs: deploy: runs-on: ubuntu-latest needs: ci - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/main' steps: - name: Deploy to GitHub Pages id: deployment diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index adeeb6a..873ed3d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -27,7 +27,7 @@ Guidelines for bug reports: reported. 2. **Check if the issue has been fixed** — try to reproduce it using the - `master` branch in the repository. + `main` branch in the repository. 3. **Isolate and report the problem** — ideally create a reduced test case. @@ -97,16 +97,16 @@ in order to craft an excellent pull request: 2. If you cloned a while ago, get the latest changes from upstream, and update your fork: ```bash - git checkout master - git pull upstream master + git checkout main + git pull upstream main git push ``` -3. Create a new topic branch (off of `master`) to contain your feature, change, +3. Create a new topic branch (off of `main`) to contain your feature, change, or fix. - **IMPORTANT**: Making changes in `master` is discouraged. You should always - keep your local `master` in sync with upstream `master` and make your + **IMPORTANT**: Making changes in `main` is discouraged. You should always + keep your local `main` in sync with upstream `main` and make your changes in topic branches. ```bash @@ -135,17 +135,17 @@ in order to craft an excellent pull request: with a clear title and description. 8. If you haven't updated your pull request for a while, you should consider - rebasing on master and resolving any conflicts. + rebasing on main and resolving any conflicts. - **IMPORTANT**: _Never ever_ merge upstream `master` into your branches. You - should always `git rebase` on `master` to bring your changes up to date when + **IMPORTANT**: _Never ever_ merge upstream `main` into your branches. You + should always `git rebase` on `main` to bring your changes up to date when necessary. ```bash - git checkout master - git pull upstream master + git checkout main + git pull upstream main git checkout - git rebase master + git rebase main ``` @@ -159,4 +159,4 @@ in order to craft an excellent pull request: 3. Make a new version tag (for example, `v0.45.0`) 1. `git tag v0.45.0` 4. Push changes to the repo. - 1. `git push --atomic [insert-remote-branch] master v0.45.0` + 1. `git push --atomic [insert-remote-branch] main v0.45.0` diff --git a/Directory.Build.props b/Directory.Build.props index c7bc60e..f5e9e35 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -14,8 +14,8 @@ - https://github.com/ionide/FSharp.Analyzers.SDK/blob/master/LICENSE.md - https://github.com/ionide/FSharp.Analyzers.SDK/blob/master/CHANGELOG.md + https://github.com/ionide/FSharp.Analyzers.SDK/blob/main/LICENSE.md + https://github.com/ionide/FSharp.Analyzers.SDK/blob/main/CHANGELOG.md https://github.com/ionide/FSharp.Analyzers.SDK diff --git a/README.md b/README.md index ae9634f..7b8f396 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ There might be a little voice inside that tells you you're not ready; that you n I assure you, that's not the case. -This project has some clear Contribution Guidelines and expectations that you can [read here](https://github.com/Krzysztof-Cieslak/FSharp.Analyzers.SDK/blob/master/CONTRIBUTING.md). +This project has some clear Contribution Guidelines and expectations that you can [read here](https://github.com/Krzysztof-Cieslak/FSharp.Analyzers.SDK/blob/main/CONTRIBUTING.md). The contribution guidelines outline the process that you'll need to follow to get a patch merged. By making expectations and process explicit, I hope it will make it easier for you to contribute. @@ -50,4 +50,4 @@ Thank you for contributing! The project is hosted on [GitHub](https://github.com/Krzysztof-Cieslak/FSharp.Analyzers.SDK) where you can [report issues](https://github.com/Krzysztof-Cieslak/FSharp.Analyzers.SDK/issues), fork the project and submit pull requests. -The library is available under [MIT license](https://github.com/Krzysztof-Cieslak/FSharp.Analyzers.SDK/blob/master/LICENSE.md), which allows modification and redistribution for both commercial and non-commercial purposes. +The library is available under [MIT license](https://github.com/Krzysztof-Cieslak/FSharp.Analyzers.SDK/blob/main/LICENSE.md), which allows modification and redistribution for both commercial and non-commercial purposes. diff --git a/docs/index.md b/docs/index.md index 592f0e1..3c1adf6 100644 --- a/docs/index.md +++ b/docs/index.md @@ -36,7 +36,7 @@ There might be a little voice inside that tells you you're not ready; that you n I assure you, that's not the case. -This project has some clear Contribution Guidelines and expectations that you can [read here](https://github.com/Krzysztof-Cieslak/FSharp.Analyzers.SDK/blob/master/CONTRIBUTING.md). +This project has some clear Contribution Guidelines and expectations that you can [read here](https://github.com/Krzysztof-Cieslak/FSharp.Analyzers.SDK/blob/main/CONTRIBUTING.md). The contribution guidelines outline the process that you'll need to follow to get a patch merged. By making expectations and process explicit, I hope it will make it easier for you to contribute. @@ -50,6 +50,6 @@ Thank you for contributing! The project is hosted on [GitHub](https://github.com/Krzysztof-Cieslak/FSharp.Analyzers.SDK) where you can [report issues](https://github.com/Krzysztof-Cieslak/FSharp.Analyzers.SDK/issues), fork the project and submit pull requests. -The library is available under [MIT license](https://github.com/Krzysztof-Cieslak/FSharp.Analyzers.SDK/blob/master/LICENSE.md), which allows modification and redistribution for both commercial and non-commercial purposes. +The library is available under [MIT license](https://github.com/Krzysztof-Cieslak/FSharp.Analyzers.SDK/blob/main/LICENSE.md), which allows modification and redistribution for both commercial and non-commercial purposes. [Next]({{fsdocs-next-page-link}})