Skip to content

Commit

Permalink
Merge branch 'develop' into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
dkotter committed Feb 29, 2024
2 parents ff44211 + 63e534c commit 7d71429
Show file tree
Hide file tree
Showing 9 changed files with 116 additions and 125 deletions.
2 changes: 2 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ updates:
directory: /
schedule:
interval: daily
open-pull-requests-limit: 0

- package-ecosystem: npm
directory: /
schedule:
interval: daily
open-pull-requests-limit: 0
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file, per [the Ke

## [Unreleased] - TBD

## [2.1.1] - 2024-02-29
### Changed
- Disabled dependabot version updates for GitHub Actions and npm dependencies (props [@iamdharmesh](https://github.com/iamdharmesh), [@jeffpaul](https://github.com/jeffpaul) via [#113](https://github.com/10up/action-repo-automator/pull/113))
- Updated pull request validation input to accept true/false instead of a regex expression (props [@iamdharmesh](https://github.com/iamdharmesh), [@dkotter](https://github.com/dkotter) via [#114](https://github.com/10up/action-repo-automator/pull/114))

### Security
- Bump `eslint` from 8.53.0 to 8.54.0 (props [@dependabot[bot]](https://github.com/apps/dependabot), [@iamdharmesh](https://github.com/iamdharmesh) via [#112](https://github.com/10up/action-repo-automator/pull/112))

## [2.1.0] - 2023-11-14
### Changed
- Skip merge conflict check and auto-sync on pull requests from bots (props [@iamdharmesh](https://github.com/iamdharmesh), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#100](https://github.com/10up/action-repo-automator/pull/100))
Expand Down Expand Up @@ -57,6 +65,7 @@ All notable changes to this project will be documented in this file, per [the Ke
- Initial project release 🎉

[Unreleased]: https://github.com/10up/action-repo-automator/compare/trunk...develop
[2.1.1]: https://github.com/10up/action-repo-automator/compare/2.1.0..2.1.1
[2.1.0]: https://github.com/10up/action-repo-automator/compare/2.0.0..2.1.0
[2.0.0]: https://github.com/10up/action-repo-automator/compare/1.0.1..2.0.0
[1.0.1]: https://github.com/10up/action-repo-automator/compare/1.0.0..1.0.1
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ This GitHub Action Helps with the following operations:
| comment-ignore-users | - | List of users to ignore for adding comments when the issue or PR is opened by them. Add prefix `team:` if you want to ignore users from the team. |
| reviewers | `team:open-source-practice` | List of Reviewers to request PR review after passing all validation checks. Add prefix `team:` if you want to request review from the team.
| sync-pr-branch | false | Whether to enable automatic synchronization of the pull request branch with the base branch |
| description-validation | `#\\s*Description of the Change.*\\r?\\n([^#]+)` | A regex pattern for validating the pull request description. Pass `false` to disable description validation |
| changelog-validation | `#\\s*Changelog.*\\r?\\n([^#]+)` | A regex pattern for validating the pull request changelog entry. Pass `false` to disable changelog validation |
| credits-validation | `#\\s*Credits.*\\r?\\n([^#]+)` | A regex pattern for validating the props given in pull request. Pass `false` to disable credits validation |
| validate-description | true | Whether to validate the pull request description. Pass `false` to disable description validation |
| validate-changelog | true | Whether to validate the pull request changelog entry. Pass `false` to disable changelog validation |
| validate-credits | true | Whether to validate the props given in pull request. Pass `false` to disable credits validation |
| wait-ms | `15000` | Time to wait in milliseconds between retries to check PR mergeable status |
| max-retries | `5` | Maximum number of retries to check PR mergeable status |

Expand Down
18 changes: 9 additions & 9 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,18 +58,18 @@ inputs:
description: "Whether to enable automatic synchronization of the pull request branch with the base branch"
required: false
default: false
description-validation:
description: "A regex pattern for validating the pull request description"
validate-description:
description: "Whether to validate the pull request description"
required: false
default: "#\\s*Description of the Change.*\\r?\\n([^#]+)"
changelog-validation:
description: "A regex pattern for validating the pull request changelog entry"
default: true
validate-changelog:
description: "Whether to validate the pull request changelog entry"
required: false
default: "#\\s*Changelog.*\\r?\\n([^#]+)"
credits-validation:
description: "A regex pattern for validating the props given in pull request"
default: true
validate-credits:
description: "Whether to validate the props given in pull request"
required: false
default: "#\\s*Credits.*\\r?\\n([^#]+)"
default: true
max-retries:
description: "Maximum number of retries to check PR mergeable status"
required: false
Expand Down
84 changes: 37 additions & 47 deletions dist/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 17 additions & 17 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "10up/action-repo-automator",
"version": "2.1.0",
"version": "2.1.1",
"description": "GitHub Action to automate some common repository operations and validate PR description, changelog and credits.",
"keywords": [
"GitHub",
Expand Down Expand Up @@ -34,6 +34,6 @@
},
"devDependencies": {
"@vercel/ncc": "^0.38.1",
"eslint": "^8.53.0"
"eslint": "^8.54.0"
}
}
Loading

0 comments on commit 7d71429

Please sign in to comment.