Split up C and C+ checklists into two different tests

.github/actions/javascript/contributorChecklist/action.yml

@@ -4,6 +4,9 @@ inputs:
   GITHUB_TOKEN:
     description: Auth token for New Expensify Github
     required: true
+  CHECKLIST:
+    description: The checklist to look for, either 'contributor' or 'contributorPlus'
+    required: true
 runs:
   using: 'node16'
   main: './index.js'

.github/actions/javascript/contributorChecklist/contributorChecklist.js

@@ -97,6 +97,8 @@ const completedContributorPlusChecklist = `- [x] I have verified the author chec
 - [x] If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
 - [x] I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.`;
 
+// True if we are validating a contributor checklist, otherwise we are validating a contributor+ checklist
+const verifyingContributorChecklist = core.getInput('CHECKLIST', {required: true}) === 'contributor';
 const issue = github.context.payload.issue ? github.context.payload.issue.number : github.context.payload.pull_request.number;
 const combinedData = [];
 
@@ -150,17 +152,17 @@ getPullRequestBody()
             }
         }
 
-        if (!contributorChecklistComplete) {
+        if (verifyingContributorChecklist && !contributorChecklistComplete) {
             console.log('Make sure you are using the most up to date checklist found here: https://raw.githubusercontent.com/Expensify/App/main/.github/PULL_REQUEST_TEMPLATE.md');
             core.setFailed('Contributor checklist is not completely filled out. Please check every box to verify you\'ve thought about the item.');
             return;
         }
 
-        if (!contributorPlusChecklistComplete) {
+        if (!verifyingContributorChecklist && !contributorPlusChecklistComplete) {
             console.log('Make sure you are using the most up to date checklist found here: https://raw.githubusercontent.com/Expensify/App/main/.github/PULL_REQUEST_TEMPLATE.md');
-            core.setFailed('Contributor plus checklist is not completely filled out. Please check every box to verify you\'ve thought about the item.');
+            core.setFailed('Contributor+ checklist is not completely filled out. Please check every box to verify you\'ve thought about the item.');
             return;
         }
 
-        console.log('All checklists are complete 🎉');
+        console.log(`${verifyingContributorChecklist ? 'Contributor' : 'Contributor+'} checklist is complete 🎉`);
     });

.github/actions/javascript/contributorChecklist/index.js

@@ -107,6 +107,8 @@ const completedContributorPlusChecklist = `- [x] I have verified the author chec
 - [x] If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
 - [x] I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.`;
 
+// True if we are validating a contributor checklist, otherwise we are validating a contributor+ checklist
+const verifyingContributorChecklist = core.getInput('CHECKLIST', {required: true}) === 'contributor';
 const issue = github.context.payload.issue ? github.context.payload.issue.number : github.context.payload.pull_request.number;
 const combinedData = [];
 
@@ -160,19 +162,19 @@ getPullRequestBody()
             }
         }
 
-        if (!contributorChecklistComplete) {
+        if (verifyingContributorChecklist && !contributorChecklistComplete) {
             console.log('Make sure you are using the most up to date checklist found here: https://raw.githubusercontent.com/Expensify/App/main/.github/PULL_REQUEST_TEMPLATE.md');
             core.setFailed('Contributor checklist is not completely filled out. Please check every box to verify you\'ve thought about the item.');
             return;
         }
 
-        if (!contributorPlusChecklistComplete) {
+        if (!verifyingContributorChecklist && !contributorPlusChecklistComplete) {
             console.log('Make sure you are using the most up to date checklist found here: https://raw.githubusercontent.com/Expensify/App/main/.github/PULL_REQUEST_TEMPLATE.md');
-            core.setFailed('Contributor plus checklist is not completely filled out. Please check every box to verify you\'ve thought about the item.');
+            core.setFailed('Contributor+ checklist is not completely filled out. Please check every box to verify you\'ve thought about the item.');
             return;
         }
 
-        console.log('All checklists are complete 🎉');
+        console.log(`${verifyingContributorChecklist ? 'Contributor' : 'Contributor+'} checklist is complete 🎉`);
     });
 
 

.github/workflows/contributorChecklists.yml

@@ -0,0 +1,14 @@
+name: Contributor Checklist
+
+on: pull_request
+
+jobs:
+  checklist:
+    runs-on: ubuntu-latest
+    if: github.actor != 'OSBotify' && (github.event_name == 'pull_request' && contains(github.event.pull_request.body, '- ['))
+    steps:
+      - name: contributorChecklist.js
+        uses: Expensify/App/.github/actions/javascript/contributorChecklist@andrew-checklist-3
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CHECKLIST: 'contributor'

.github/workflows/contributorPlusChecklists.yml

@@ -0,0 +1,14 @@
+name: Contributor+ Checklist
+
+on: issue_comment
+
+jobs:
+  checklist:
+    runs-on: ubuntu-latest
+    if: github.actor != 'OSBotify' && (contains(github.event.issue.pull_request.url, 'http') && github.event_name == 'issue_comment' && contains(github.event.comment.body, '- ['))
+    steps:
+      - name: contributorChecklist.js
+        uses: Expensify/App/.github/actions/javascript/contributorChecklist@andrew-checklist-3
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CHECKLIST: 'contributorPlus'