diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 216c254..854c889 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -4,6 +4,6 @@ --- -* [ ] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws-actions/configure-aws-credentials/blob/master/CONTRIBUTING.md) +* [ ] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws-actions/configure-aws-credentials/blob/main/CONTRIBUTING.md) By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice. diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b16fd27..71d72ff 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,4 +6,4 @@ updates: interval: weekly day: tuesday open-pull-requests-limit: 10 - target-branch: 'master' + target-branch: 'main' diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 5b81b88..5596345 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -3,7 +3,7 @@ name: Update dist files on on: push: branches: - - master + - main paths-ignore: - 'dist/**' diff --git a/.mergify.yml b/.mergify.yml index f20bc2a..050f7b7 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -7,7 +7,7 @@ queue_rules: pull_request_rules: - name: Automatically merge on CI success and review approval conditions: - - base~=master|integ-tests + - base~=main|integ-tests - "#approved-reviews-by>=1" - -approved-reviews-by~=author - status-success=Run Unit Tests @@ -23,7 +23,7 @@ pull_request_rules: - name: Automatically approve and merge Dependabot PRs conditions: - - base~=master + - base~=main - author=dependabot[bot] - status-success=Run Unit Tests - -title~=(WIP|wip) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 11be27b..eb97330 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,7 +23,7 @@ reported the issue. Please try to include as much information as you can. Detail ## Contributing via Pull Requests Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that: -1. You are working against the latest source on the *master* branch. +1. You are working against the latest source on the *main* branch. 2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already. 3. You open an issue to discuss any significant work - we would hate for your time to be wasted. @@ -56,6 +56,6 @@ If you discover a potential security issue in this project we ask that you notif ## Licensing -See the [LICENSE](https://github.com/aws-actions/configure-aws-credentials/blob/master/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution. +See the [LICENSE](https://github.com/aws-actions/configure-aws-credentials/blob/main/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution. We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.