1.0.1

.gitattributes

@@ -1 +0,0 @@
-.licenses/** -diff linguist-generated=true

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,38 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/workflows/ci.yml

@@ -1,6 +1,6 @@
 on:
-  push: {branches: main}
-  pull_request: {branches: main}
+  push: {branches: master}
+  pull_request: {branches: master}
 
 jobs:
   ci:

.github/workflows/integration.yml

@@ -1,12 +1,12 @@
 on:
-  push: {branches: main}
+  push: {branches: master}
 
 jobs:
   integration:
     runs-on: ubuntu-latest
     steps:
       - id: output-set
-        uses: actions/github-script@main
+        uses: actions/github-script@master
         with:
           script: return core.getInput('input-value')
           result-encoding: string

.github/workflows/licensed.yml

@@ -1,27 +0,0 @@
-name: Licensed
-
-on:
-  push: {branches: main}
-  pull_request: {branches: main}
-  repository_dispatch:
-  workflow_dispatch:
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    name: Check licenses
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v1
-        with:
-          path: ~/.npm
-          key: ${{runner.os}}-npm-${{hashFiles('**/package-lock.json')}}
-          restore-keys: ${{runner.os}}-npm-
-      - run: npm ci
-      - name: Install licensed
-        run: |-
-          cd $RUNNER_TEMP
-          curl -Lfs -o licensed.tar.gz https://github.com/github/licensed/releases/download/2.9.2/licensed-2.9.2-linux-x64.tar.gz
-          sudo tar -xzf licensed.tar.gz
-          sudo mv licensed /usr/local/bin/licensed
-      - run: licensed status

.github/workflows/pull-request-test.yml

@@ -1,39 +0,0 @@
-on:
-  pull_request:
-    branches: main
-    types: [opened, synchronize]
-
-jobs:
-  pull-request-test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: ./
-        with:
-          script: |
-            // Get the existing comments.
-            const {data: comments} = await github.issues.listComments({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.payload.number,
-            })
-
-            // Find any comment already made by the bot.
-            const botComment = comments.find(comment => comment.user.id === 41898282)
-            const commentBody = "Hello from actions/github-script! (${{ github.sha }})"
-
-            if (botComment) {
-              await github.issues.updateComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                comment_id: botComment.id,
-                body: commentBody
-              })
-            } else {
-              await github.issues.createComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: context.payload.number,
-                body: commentBody
-              })
-            }

.github/workflows/stale.yml

@@ -1,31 +0,0 @@
-name: Stale Issues & PRs
-
-on:
-  schedule:
-    - cron: '0 0 * * *'
-  workflow_dispatch:
-
-jobs:
-  mark_stale:
-    name: Mark issues and PRs as stale
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v3
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          exempt-issue-labels: Not Stale
-          exempt-pr-labels: Not Stale
-          stale-issue-message: >
-            This issue is stale because it has been open for 60 days with no
-            activity. Remove the "Stale" label or comment on the issue, or it
-            will be closed in 7 days.
-          stale-pr-message: >
-            This pull request is stale because it has been open for 60 days
-            with no activity. Remove the "Stale" label or comment on the pull
-            request, or it will be closed in 7 days.
-          close-issue-message: >
-            This issue has been marked as stale and closed due to no activity
-            on it.
-          close-pr-message: >
-            This pull request has been marked as stale and closed due to no
-            activity on it.

.licensed.yml

@@ -1,14 +0,0 @@
-sources:
-  npm: true
-
-allowed:
-  - apache-2.0
-  - bsd-2-clause
-  - bsd-3-clause
-  - isc
-  - mit
-  - cc0-1.0
-  - unlicense
-
-reviewed:
-  npm:

README.md

@@ -1,4 +1,4 @@
-# github-script ![.github/workflows/integration.yml](https://github.com/actions/github-script/workflows/.github/workflows/integration.yml/badge.svg?event=push) ![.github/workflows/ci.yml](https://github.com/actions/github-script/workflows/.github/workflows/ci.yml/badge.svg?event=push) ![.github/workflows/licensed.yml](https://github.com/actions/github-script/workflows/Licensed/badge.svg?event=push)
+# github-script ![.github/workflows/integration.yml](https://github.com/actions/github-script/workflows/.github/workflows/integration.yml/badge.svg?event=push) ![.github/workflows/ci.yml](https://github.com/actions/github-script/workflows/.github/workflows/ci.yml/badge.svg?event=push)
 
 This action makes it easy to quickly write a script in your workflow that
 uses the GitHub API and the workflow run context.
@@ -10,9 +10,8 @@ arguments will be provided:
 - `github` A pre-authenticated
   [octokit/rest.js](https://github.com/octokit/rest.js) client
 - `context` An object containing the [context of the workflow
-  run](https://github.com/actions/toolkit/blob/main/packages/github/src/context.ts)
-- `core` A reference to the [@actions/core](https://github.com/actions/toolkit/tree/main/packages/core) package
-- `io` A reference to the [@actions/io](https://github.com/actions/toolkit/tree/main/packages/io) package
+  run](https://github.com/actions/toolkit/tree/master/packages/github)
+- `core` A reference to the [@actions/core](https://github.com/actions/toolkit/tree/master/packages/core) package
 
 Since the `script` is just a function body, these values will already be
 defined, so you don't have to (see examples below).
@@ -33,7 +32,7 @@ The return value of the script will be in the step's outputs under the
 "result" key.
 
 ```yaml
-- uses: actions/github-script@v3
+- uses: actions/github-script@v1
   id: set-result
   with:
     script: return "Hello!"
@@ -52,7 +51,7 @@ output of a github-script step. For some workflows, string encoding is preferred
 `result-encoding` input:
 
 ```yaml
-- uses: actions/github-script@v3
+- uses: actions/github-script@v1
   id: my-script
   with:
     github-token: ${{secrets.GITHUB_TOKEN}}
@@ -78,7 +77,7 @@ jobs:
   comment:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@v3
+      - uses: actions/github-script@v1
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
@@ -101,7 +100,7 @@ jobs:
   apply-label:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@v3
+      - uses: actions/github-script@v1
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
@@ -122,7 +121,7 @@ jobs:
   welcome:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@v3
+      - uses: actions/github-script@v1
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
@@ -166,7 +165,7 @@ jobs:
   diff:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@v3
+      - uses: actions/github-script@v1
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
@@ -175,10 +174,6 @@ jobs:
             console.log(result)
 ```
 
-_(Note that this particular example only works for a public URL, where the
-diff URL is publicly accessible. Getting the diff for a private URL requires
-using the API.)_
-
 This will print the full diff object in the screen; `result.data` will
 contain the actual diff text.
 
@@ -194,244 +189,19 @@ jobs:
   echo-input:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/github-script@v2
+      - uses: @actions/checkout@v2
+      - uses: @actions/github-script@v1
         with:
           script: |
-            const script = require(`${process.env.GITHUB_WORKSPACE}/path/to/script.js`)
-            console.log(script({github, context}))
+            const path = require('path')
+            const scriptPath = path.resolve('./path/to/script.js')
+            console.log(require(scriptPath)({context}))
 ```
 
-*Note that the script path given to `require()` must be an **absolute path** in this case, hence using [`GITHUB_WORKSPACE`](https://docs.github.com/en/actions/configuring-and-managing-workflows/using-environment-variables#default-environment-variables).*
-
 And then export a function from your module:
 
 ```javascript
-module.exports = (github, context) => {
-  return context.payload.client_payload.value
-}
-```
-
-You can also use async functions in this manner, as long as you `await` it in
-the inline script.
-
-Note that because you can't `require` things like the GitHub context or
-Actions Toolkit libraries, you'll want to pass them as arguments to your
-external function.
-
-Additionally, you'll want to use the [checkout
-action](https://github.com/actions/checkout) to make sure your script file is
-available.
-
-
-This action makes it easy to quickly write a script in your workflow that
-uses the GitHub API and the workflow run context.
-
-In order to use this action, a `script` input is provided. The value of that
-input should be the body of an asynchronous function call. The following
-arguments will be provided:
-
-- `github` A pre-authenticated
-  [octokit/rest.js](https://github.com/octokit/rest.js) client
-- `context` An object containing the [context of the workflow
-  run](https://github.com/actions/toolkit/blob/main/packages/github/src/context.ts)
-- `core` A reference to the [@actions/core](https://github.com/actions/toolkit/tree/main/packages/core) package
-- `io` A reference to the [@actions/io](https://github.com/actions/toolkit/tree/main/packages/io) package
-
-Since the `script` is just a function body, these values will already be
-defined, so you don't have to (see examples below).
-
-See [octokit/rest.js](https://octokit.github.io/rest.js/) for the API client
-documentation.
-
-**Note** This action is still a bit of an experiment—the API may change in
-future versions. 🙂
-
-## Development
-
-See [development.md](/docs/development.md).
-
-## Reading step results
-
-The return value of the script will be in the step's outputs under the
-"result" key.
-
-```yaml
-- uses: actions/github-script@v3
-  id: set-result
-  with:
-    script: return "Hello!"
-    result-encoding: string
-- name: Get result
-  run: echo "${{steps.set-result.outputs.result}}"
-```
-
-See ["Result encoding"](#result-encoding) for details on how the encoding of
-these outputs can be changed.
-
-## Result encoding
-
-By default, the JSON-encoded return value of the function is set as the "result" in the
-output of a github-script step. For some workflows, string encoding is preferred. This option can be set using the
-`result-encoding` input:
-
-```yaml
-- uses: actions/github-script@v3
-  id: my-script
-  with:
-    github-token: ${{secrets.GITHUB_TOKEN}}
-    result-encoding: string
-    script: return "I will be string (not JSON) encoded!"
-```
-
-## Examples
-
-Note that `github-token` is optional in this action, and the input is there
-in case you need to use a non-default token.
-
-By default, github-script will use the token provided to your workflow.
-
-### Comment on an issue
-
-```yaml
-on:
-  issues:
-    types: [opened]
-
-jobs:
-  comment:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/github-script@v3
-        with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          script: |
-            github.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: '👋 Thanks for reporting!'
-            })
-```
-
-### Apply a label to an issue
-
-```yaml
-on:
-  issues:
-    types: [opened]
-
-jobs:
-  apply-label:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/github-script@v3
-        with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          script: |
-            github.issues.addLabels({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              labels: ['Triage']
-            })
-```
-
-### Welcome a first-time contributor
-
-```yaml
-on: pull_request
-
-jobs:
-  welcome:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/github-script@v3
-        with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          script: |
-            // Get a list of all issues created by the PR opener
-            // See: https://octokit.github.io/rest.js/#pagination
-            const creator = context.payload.sender.login
-            const opts = github.issues.listForRepo.endpoint.merge({
-              ...context.issue,
-              creator,
-              state: 'all'
-            })
-            const issues = await github.paginate(opts)
-
-            for (const issue of issues) {
-              if (issue.number === context.issue.number) {
-                continue
-              }
-
-              if (issue.pull_request) {
-                return // Creator is already a contributor.
-              }
-            }
-
-            await github.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: 'Welcome, new contributor!'
-            })
-```
-
-### Download data from a URL
-
-You can use the `github` object to access the Octokit API. For
-instance, `github.request`
-
-```yaml
-on: pull_request
-
-jobs:
-  diff:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/github-script@v3
-        with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          script: |
-            const diff_url = context.payload.pull_request.diff_url
-            const result = await github.request(diff_url)
-            console.log(result)
-```
-
-_(Note that this particular example only works for a public URL, where the
-diff URL is publicly accessible. Getting the diff for a private URL requires
-using the API.)_
-
-This will print the full diff object in the screen; `result.data` will
-contain the actual diff text.
-
-### Run a separate file
-
-If you don't want to inline your entire script that you want to run, you can
-use a separate JavaScript module in your repository like so:
-
-```yaml
-on: push
-
-jobs:
-  echo-input:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/github-script@v2
-        with:
-          script: |
-            const script = require(`${process.env.GITHUB_WORKSPACE}/path/to/script.js`)
-            console.log(script({github, context}))
-```
-
-*Note that the script path given to `require()` must be an **absolute path** in this case, hence using [`GITHUB_WORKSPACE`](https://docs.github.com/en/actions/configuring-and-managing-workflows/using-environment-variables#default-environment-variables).*
-
-And then export a function from your module:
-
-```javascript
-module.exports = (github, context) => {
+module.exports = ({context}) => {
   return context.payload.client_payload.value
 }
 ```

docs/development.md

@@ -25,4 +25,4 @@ Releases are done manually, for now:
 1. Ensure that the build is up to date with `npm run build`.
 1. Bump the [package.json](/package.json#L3) and [package-lock.json](/package-lock.json#L3) version numbers and commit them.
 1. Update documentation (including updated version numbers).
-1. Tag main with the new version number and create a GitHub release.
+1. Tag master with the new version number and create a GitHub release.

package.json

@@ -1,7 +1,7 @@
 {
   "name": "github-script",
   "description": "A GitHub action for executing a simple script",
-  "version": "3.0.0",
+  "version": "1.0.1",
   "author": "GitHub",
   "license": "MIT",
   "main": "dist/index.js",
@@ -36,24 +36,20 @@
   },
   "dependencies": {
     "@actions/core": "^1.2.4",
-    "@actions/github": "^4.0.0",
-    "@actions/io": "^1.0.2",
-    "@octokit/core": "^3.1.2",
-    "@octokit/plugin-paginate-rest": "^2.3.0",
-    "@octokit/plugin-rest-endpoint-methods": "^4.1.2"
+    "@actions/github": "^2.2.0"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.10",
-    "@typescript-eslint/eslint-plugin": "^3.9.1",
-    "@typescript-eslint/parser": "^3.9.1",
-    "@vercel/ncc": "^0.23.0",
-    "eslint": "^7.7.0",
+    "@types/jest": "^25.1.4",
+    "@typescript-eslint/eslint-plugin": "^2.33.0",
+    "@typescript-eslint/parser": "^2.33.0",
+    "@zeit/ncc": "^0.22.0",
+    "eslint": "^7.0.0",
     "eslint-config-prettier": "^6.11.0",
     "husky": "^4.2.5",
-    "jest": "^26.4.1",
+    "jest": "^25.1.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.0.5",
-    "ts-jest": "^26.2.0",
-    "typescript": "^4.0.2"
+    "ts-jest": "^25.2.1",
+    "typescript": "^3.8.3"
   }
 }

src/async-function.ts

@@ -1,15 +1,13 @@
 import * as core from '@actions/core'
+import {GitHub} from '@actions/github'
 import {Context} from '@actions/github/lib/context'
-import {GitHub} from '@actions/github/lib/utils'
-import * as io from '@actions/io'
 
 const AsyncFunction = Object.getPrototypeOf(async () => null).constructor
 
 type AsyncFunctionArguments = {
   context: Context
   core: typeof core
-  github: InstanceType<typeof GitHub>
-  io: typeof io
+  github: GitHub
   require: NodeRequire
 }
 

src/main.ts

@@ -1,6 +1,5 @@
 import * as core from '@actions/core'
-import {context, getOctokit} from '@actions/github'
-import * as io from '@actions/io'
+import {context, GitHub} from '@actions/github'
 import {callAsyncFunction} from './async-function'
 
 process.on('unhandledRejection', handleError)
@@ -23,12 +22,12 @@ async function main(): Promise<void> {
   if (userAgent != null) opts.userAgent = userAgent
   if (previews != null) opts.previews = previews.split(',')
 
-  const github = getOctokit(token, opts)
+  const github = new GitHub(token, opts)
   const script = core.getInput('script', {required: true})
 
   // Using property/value shorthand on `require` (e.g. `{require}`) causes compilation errors.
   const result = await callAsyncFunction(
-    {require: require, github, context, core, io},
+    {require: require, github, context, core},
     script
   )