Merge branch 'develop' into trunk

.github/workflows/check-dist.yml

@@ -21,10 +21,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set Node.js 16.x
-        uses: actions/setup-node@v3.8.0
+        uses: actions/setup-node@v4.0.0
         with:
           node-version: 16.x
 

.github/workflows/codeql-analysis.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/repo-automator.yml

@@ -12,6 +12,7 @@ on:
       - edited
       - converted_to_draft
       - ready_for_review
+      - synchronize
     branches:
       - develop
 

CHANGELOG.md

@@ -4,7 +4,24 @@ All notable changes to this project will be documented in this file, per [the Ke
 
 ## [Unreleased] - TBD
 
-## [2.0.0] - 2023-08-XX
+## [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))
+
+### Fixed
+- Ensure we properly remove all HTML comments from input strings (props [@dkotter](https://github.com/dkotter), [@iamdharmesh](https://github.com/iamdharmesh) via [#108](https://github.com/10up/action-repo-automator/pull/108))
+
+### Security
+- Bump `actions/setup-node` from 3.8.0 to 4.0.0 (props [@dependabot[bot]](https://github.com/apps/dependabot), [@iamdharmesh](https://github.com/iamdharmesh) via [#90](https://github.com/10up/action-repo-automator/pull/90), [#107](https://github.com/10up/action-repo-automator/pull/107))
+- Bump `eslint` from 8.47.0 to 8.53.0 (props [@dependabot[bot]](https://github.com/apps/dependabot), [@iamdharmesh](https://github.com/iamdharmesh) via [#92](https://github.com/10up/action-repo-automator/pull/92), [#95](https://github.com/10up/action-repo-automator/pull/95), [#99](https://github.com/10up/action-repo-automator/pull/99), [#101](https://github.com/10up/action-repo-automator/pull/101), [#106](https://github.com/10up/action-repo-automator/pull/106), [#110](https://github.com/10up/action-repo-automator/pull/110))
+- Bump `actions/checkout` from 3 to 4 (props [@dependabot[bot]](https://github.com/apps/dependabot), [@iamdharmesh](https://github.com/iamdharmesh) via [#93](https://github.com/10up/action-repo-automator/pull/93))
+- Bump `@vercel/ncc` from 0.36.1 to 0.38.1 (props [@dependabot[bot]](https://github.com/apps/dependabot), [@iamdharmesh](https://github.com/iamdharmesh) via [#94](https://github.com/10up/action-repo-automator/pull/94), [#104](https://github.com/10up/action-repo-automator/pull/104))
+- Bump `@actions/core` from 1.10.0 to 1.10.1 (props [@dependabot[bot]](https://github.com/apps/dependabot), [@iamdharmesh](https://github.com/iamdharmesh) via [#96](https://github.com/10up/action-repo-automator/pull/96))
+- Bump `@octokit/action` from 6.0.5 to 6.0.6 (props [@dependabot[bot]](https://github.com/apps/dependabot), [@iamdharmesh](https://github.com/iamdharmesh) via [#98](https://github.com/10up/action-repo-automator/pull/98))
+- Bump `@actions/github` from 5.1.1 to 6.0.0 (props [@dependabot[bot]](https://github.com/apps/dependabot), [@iamdharmesh](https://github.com/iamdharmesh) via [#102](https://github.com/10up/action-repo-automator/pull/102))
+- Bump `undici` from 5.25.4 to 5.26.4 (props [@dependabot[bot]](https://github.com/apps/dependabot), [@iamdharmesh](https://github.com/iamdharmesh) via [#105](https://github.com/10up/action-repo-automator/pull/105))
+
+## [2.0.0] - 2023-08-21
 **Note that this release renames action to "Repo Automator"**
 
 ### Added
@@ -40,6 +57,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.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
 [1.0.0]: https://github.com/10up/action-repo-automator/releases/tag/1.0.0

CREDITS.md

@@ -12,7 +12,7 @@ The following individuals are responsible for curating the list of issues, respo
 
 Thank you to all the people who have already contributed to this repository via bug reports, code, design, ideas, project management, translation, testing, etc.
 
-[Dharmesh Patel (@iamdharmesh)](https://github.com/iamdharmesh), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Ravinder Kumar (@ravinderk)](https://github.com/ravinderk), [Pedro da Luz (@senhordaluz)](https://github.com/senhordaluz), [Dependabot (@dependabot[bot])](https://github.com/apps/dependabot)
+[Dharmesh Patel (@iamdharmesh)](https://github.com/iamdharmesh), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Ravinder Kumar (@ravinderk)](https://github.com/ravinderk), [Pedro da Luz (@senhordaluz)](https://github.com/senhordaluz), [Dependabot (@dependabot[bot])](https://github.com/apps/dependabot), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc)
 
 ## Libraries