Release v1.1.0

README.md

@@ -14,13 +14,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Invite contributor to the organization
-        uses: lekterable/inclusive-organization-action@v1.0.0
+        uses: lekterable/inclusive-organization-action@v1.1.0
         with:
           organization: your-organization-name
+          team: your-team-name
+          comment: Single or multiline comment
         env:
           ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
 ```
-**NOTE:** replace *`your-organization-name`* with the name of the organization you want to invite contributors to and create a [repository secret](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets) called *`ACCESS_TOKEN`* and as a value provide a GitHub [personal access token](https://github.com/settings/tokens) with the scope of *`admin:org`*.
+
+***organization*** - *(required)* name of the organization to which you would like to invite your contributors
+
+***team*** - *(optional)* name of the team within your organization to which you would like to add your contributors
+
+***comment*** - *(optional)* single or multiline *(use yaml syntax)* comment which will be added, when contributor's first PR gets merged
+
+**NOTE:** create a [repository secret](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets) called *`ACCESS_TOKEN`* *(or give it another name, but don't forget to change it in the workflow)* and as a value provide a GitHub [personal access token](https://github.com/settings/tokens) with the scope of *`admin:org`*, if you want to be able to add comments you will also need *`public_repo`* .
 
 ## License
 

action.yml

@@ -8,6 +8,12 @@ inputs:
   organization:
     description: Name of the organization to which you would like to invite contributors.
     required: true
+  team:
+    description: Name of the team within organization to which you would like to add contributors.
+    required: false
+  comment:
+    description: A comment which will be posted on the contributors PR.
+    required: false
 runs:
   using: node12
   main: dist/index.js

dist/index.js

@@ -524,9 +524,13 @@ module.exports = require("os");
 const core = __webpack_require__(470)
 const github = __webpack_require__(469)
 
+const transformTeamName = teamName => teamName.toLowerCase().replace(' ', '-')
+
 const run = async () => {
   try {
     const organization = core.getInput('organization', { required: true })
+    const teamName = core.getInput('team')
+    const comment = core.getInput('comment')
     const { ACCESS_TOKEN } = process.env
 
     if (!ACCESS_TOKEN)
@@ -545,27 +549,68 @@ const run = async () => {
     const isMergeCommit = commit.data.parents.length > 1
     if (!isMergeCommit) return
 
-    const { data } = await octokit.repos.listPullRequestsAssociatedWithCommit({
+    const {
+      data: [pullRequest],
+    } = await octokit.repos.listPullRequestsAssociatedWithCommit({
       owner: repository.owner.login,
       repo: repository.name,
       commit_sha: sha,
     })
 
-    const contributor = data[0].user
+    const contributor = pullRequest.user
 
-    try {
-      await octokit.orgs.checkMembership({
+    if (teamName) {
+      const team = await octokit.teams.getByName({
         org: organization,
-        username: contributor.login,
+        team_slug: transformTeamName(teamName),
       })
-    } catch (_) {
+
       try {
-        await octokit.orgs.createInvitation({
+        await octokit.teams.getMembership({
+          team_id: team.data.id,
+          username: contributor.login,
+        })
+      } catch (_) {
+        try {
+          await octokit.teams.addOrUpdateMembership({
+            team_id: team.data.id,
+            username: contributor.login,
+          })
+
+          if (comment)
+            await octokit.issues.createComment({
+              owner: repository.owner.login,
+              repo: repository.name,
+              issue_number: pullRequest.number,
+              body: comment,
+            })
+        } catch (error) {
+          core.setFailed(error.message)
+        }
+      }
+    } else {
+      try {
+        await octokit.orgs.checkMembership({
           org: organization,
-          invitee_id: contributor.id,
+          username: contributor.login,
         })
-      } catch (error) {
-        core.setFailed(error.message)
+      } catch (_) {
+        try {
+          await octokit.orgs.createInvitation({
+            org: organization,
+            invitee_id: contributor.id,
+          })
+
+          if (comment)
+            await octokit.issues.createComment({
+              owner: repository.owner.login,
+              repo: repository.name,
+              issue_number: pullRequest.number,
+              body: comment,
+            })
+        } catch (error) {
+          core.setFailed(error.message)
+        }
       }
     }
   } catch (error) {

index.js

@@ -1,9 +1,13 @@
 const core = require('@actions/core')
 const github = require('@actions/github')
 
+const transformTeamName = teamName => teamName.toLowerCase().replace(' ', '-')
+
 const run = async () => {
   try {
     const organization = core.getInput('organization', { required: true })
+    const teamName = core.getInput('team')
+    const comment = core.getInput('comment')
     const { ACCESS_TOKEN } = process.env
 
     if (!ACCESS_TOKEN)
@@ -22,27 +26,68 @@ const run = async () => {
     const isMergeCommit = commit.data.parents.length > 1
     if (!isMergeCommit) return
 
-    const { data } = await octokit.repos.listPullRequestsAssociatedWithCommit({
+    const {
+      data: [pullRequest],
+    } = await octokit.repos.listPullRequestsAssociatedWithCommit({
       owner: repository.owner.login,
       repo: repository.name,
       commit_sha: sha,
     })
 
-    const contributor = data[0].user
+    const contributor = pullRequest.user
 
-    try {
-      await octokit.orgs.checkMembership({
+    if (teamName) {
+      const team = await octokit.teams.getByName({
         org: organization,
-        username: contributor.login,
+        team_slug: transformTeamName(teamName),
       })
-    } catch (_) {
+
       try {
-        await octokit.orgs.createInvitation({
+        await octokit.teams.getMembership({
+          team_id: team.data.id,
+          username: contributor.login,
+        })
+      } catch (_) {
+        try {
+          await octokit.teams.addOrUpdateMembership({
+            team_id: team.data.id,
+            username: contributor.login,
+          })
+
+          if (comment)
+            await octokit.issues.createComment({
+              owner: repository.owner.login,
+              repo: repository.name,
+              issue_number: pullRequest.number,
+              body: comment,
+            })
+        } catch (error) {
+          core.setFailed(error.message)
+        }
+      }
+    } else {
+      try {
+        await octokit.orgs.checkMembership({
           org: organization,
-          invitee_id: contributor.id,
+          username: contributor.login,
         })
-      } catch (error) {
-        core.setFailed(error.message)
+      } catch (_) {
+        try {
+          await octokit.orgs.createInvitation({
+            org: organization,
+            invitee_id: contributor.id,
+          })
+
+          if (comment)
+            await octokit.issues.createComment({
+              owner: repository.owner.login,
+              repo: repository.name,
+              issue_number: pullRequest.number,
+              body: comment,
+            })
+        } catch (error) {
+          core.setFailed(error.message)
+        }
       }
     }
   } catch (error) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "inclusive-organization-action",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Invite contributors to your GitHub organization when their first PR gets merged, to make them feel welcome and included.",
   "scripts": {
     "build": "ncc build index.js"