chore conventional commits

waku-org · Nov 10, 2023 · 2c26901 · 2c26901
1 parent 712febd
commit 2c26901
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/.github/workflows/lint_pr.yml b/.github/workflows/lint_pr.yml
@@ -6,7 +6,6 @@ on:
       - opened
       - edited
       - synchronize
-
 jobs:
   main:
     name: Validate PR title
@@ -15,26 +14,30 @@ jobs:
       pull-requests: write
     steps:
       - uses: amannn/action-semantic-pull-request@v5
+        id: lint_pr_title
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - uses: webiny/action-conventional-commits@v1.1.0
+        id: lint_pr_commits
       - uses: marocchino/sticky-pull-request-comment@v2
         # When the previous steps fails, the workflow would stop. By adding this
         # condition you can continue the execution with the populated error message.
-        if: always() && (steps.lint_pr_title.outputs.error_message != null)
+        if: always() && (steps.lint_pr_title.outputs.error_message != null || steps.lint_pr_commits.outputs.error_message != null )
         with:
           header: pr-title-lint-error
           message: |
             Hey there and thank you for opening this pull request! 👋🏼
             
-            We require pull request titles to follow the [Conventional Commits specification](https://www.conventionalcommits.org/en/v1.0.0/) and it looks like your proposed title needs to be adjusted.
+            We require pull request titles and commits to follow the [Conventional Commits specification](https://www.conventionalcommits.org/en/v1.0.0/) and it looks like your PR needs to be adjusted.
 
             Details:
           
             > ${{ steps.lint_pr_title.outputs.error_message }}
+            > ${{ steps.lint_pr_commits.outputs.error_message }}
 
       # Delete a previous comment when the issue has been resolved
-      - if: ${{ steps.lint_pr_title.outputs.error_message == null }}
+      - if: ${{ steps.lint_pr_title.outputs.error_message == null && steps.lint_pr_commits.outputs.error_message == null }}
         uses: marocchino/sticky-pull-request-comment@v2
         with:   
           header: pr-title-lint-error
-          delete: true
+          delete: true