Merge pull request #339 from actions/joshmgross/bump-package-version

Bump version to 6.4.0
2025-12-08 16:16:21 +00:00 · 2023-01-26 11:32:53 -05:00 · 2023-01-26 11:13:37 -05:00 · 2023-01-26 11:11:58 -05:00 · 2023-01-26 11:05:45 -05:00 · 2023-01-26 11:04:27 -05:00
17 changed files with 10265 additions and 10184 deletions
--- a/.github/workflows/check-dist.yml
+++ b/.github/workflows/check-dist.yml
@@ -22,12 +22,13 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3

-      - name: Set Node.js 12.x
-        uses: actions/setup-node@v1
+      - name: Set Node.js 16.x
+        uses: actions/setup-node@v3
        with:
-          node-version: 12.x
+          node-version: 16.x
+          cache: npm

      - name: Install dependencies
        run: npm ci
@@ -45,7 +46,7 @@ jobs:
        id: diff

      # If index.js was different than expected, upload the expected version as an artifact
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
        if: ${{ failure() && steps.diff.conclusion == 'failure' }}
        with:
          name: dist
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,10 +10,10 @@ jobs:
  ci:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
        with:
-          node-version: 12
+          node-version: 16
          cache: npm
      - run: npm ci
      - run: npm run style:check
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -10,7 +10,7 @@ jobs:
  test-return:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
      - id: output-set
        uses: ./
        with:
@@ -25,7 +25,7 @@ jobs:
  test-relative-require:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
      - id: output-set
        uses: ./
        with:
@@ -40,8 +40,8 @@ jobs:
  test-npm-require:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
        with:
          path: ~/.npm
          key: ${{runner.os}}-npm-${{hashFiles('**/package-lock.json')}}
--- a/.github/workflows/licensed.yml
+++ b/.github/workflows/licensed.yml
@@ -13,7 +13,7 @@ jobs:
    runs-on: ubuntu-latest
    name: Check licenses
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
        with:
          fetch-depth: 0 # prefer to use a full fetch for licensed workflows
      # https://github.com/jonabc/setup-licensed/releases/tag/v1.1.1
--- a/.github/workflows/pull-request-test.yml
+++ b/.github/workflows/pull-request-test.yml
@@ -9,7 +9,7 @@ jobs:
  pull-request-test:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
      - uses: ./
        with:
          script: |
--- a/.licenses/npm/@actions/core.dep.yml
+++ b/.licenses/npm/@actions/core.dep.yml
@@ -1,6 +1,6 @@
 ---
 name: "@actions/core"
-version: 1.9.1
+version: 1.10.0
 type: npm
 summary: Actions core lib
 homepage: https://github.com/actions/toolkit/tree/main/packages/core
--- a/.licenses/npm/@actions/github.dep.yml
+++ b/.licenses/npm/@actions/github.dep.yml
@@ -1,6 +1,6 @@
 ---
 name: "@actions/github"
-version: 5.1.0
+version: 5.1.1
 type: npm
 summary: Actions github lib
 homepage: https://github.com/actions/toolkit/tree/main/packages/github
--- a/.licenses/npm/@actions/glob.dep.yml
+++ b/.licenses/npm/@actions/glob.dep.yml
@@ -1,6 +1,6 @@
 ---
 name: "@actions/glob"
-version: 0.2.0
+version: 0.3.0
 type: npm
 summary: Actions glob lib
 homepage: https://github.com/actions/toolkit/tree/main/packages/glob
--- a/.licenses/npm/minimatch.dep.yml
+++ b/.licenses/npm/minimatch.dep.yml
@@ -1,9 +1,9 @@
 ---
 name: minimatch
-version: 3.0.4
+version: 3.1.2
 type: npm
 summary: a glob matcher in javascript
-homepage: https://github.com/isaacs/minimatch#readme
+homepage:
 license: isc
 licenses:
 - sources: LICENSE
--- a/README.md
+++ b/README.md
@@ -18,6 +18,7 @@ The following arguments will be provided:
 - `glob` A reference to the [@actions/glob](https://github.com/actions/toolkit/tree/main/packages/glob) package
 - `io` A reference to the [@actions/io](https://github.com/actions/toolkit/tree/main/packages/io) package
 - `exec` A reference to the [@actions/exec](https://github.com/actions/toolkit/tree/main/packages/exec) package
+- `fetch` A reference to the [node-fetch](https://github.com/node-fetch/node-fetch) package
 - `require` A proxy wrapper around the normal Node.js `require` to enable
  requiring relative paths (relative to the current working directory) and
  requiring npm packages installed in the current working directory. If for
@@ -297,7 +298,7 @@ jobs:
  echo-input:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
      - uses: actions/github-script@v6
        with:
          script: |
@@ -335,7 +336,7 @@ jobs:
  echo-input:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
      - uses: actions/github-script@v6
        env:
          SHA: '${{env.parentSHA}}'
@@ -373,10 +374,10 @@ jobs:
  echo-input:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
        with:
-          node-version: 14
+          node-version: 16
      - run: npm ci
      # or one-off:
      - run: npm install execa
@@ -409,7 +410,7 @@ jobs:
  print-stuff:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
      - uses: actions/github-script@v6
        with:
          script: |
--- a/test/get-retry-options.test.ts
+++ b/test/get-retry-options.test.ts
@@ -4,38 +4,66 @@ import {getRetryOptions} from '../src/retry-options'

 describe('getRequestOptions', () => {
  test('retries disabled if retries == 0', async () => {
-    const [retryOptions, requestOptions] = getRetryOptions(0, [400, 500, 502])
+    const [retryOptions, requestOptions] = getRetryOptions(
+      0,
+      [400, 500, 502],
+      []
+    )

    expect(retryOptions.enabled).toBe(false)
    expect(retryOptions.doNotRetry).toBeFalsy()

-    expect(requestOptions.retries).toBeFalsy()
+    expect(requestOptions?.retries).toBeFalsy()
  })

  test('properties set if retries > 0', async () => {
-    const [retryOptions, requestOptions] = getRetryOptions(1, [400, 500, 502])
+    const [retryOptions, requestOptions] = getRetryOptions(
+      1,
+      [400, 500, 502],
+      []
+    )

    expect(retryOptions.enabled).toBe(true)
    expect(retryOptions.doNotRetry).toEqual([400, 500, 502])

-    expect(requestOptions.retries).toEqual(1)
+    expect(requestOptions?.retries).toEqual(1)
  })

  test('properties set if retries > 0', async () => {
-    const [retryOptions, requestOptions] = getRetryOptions(1, [400, 500, 502])
+    const [retryOptions, requestOptions] = getRetryOptions(
+      1,
+      [400, 500, 502],
+      []
+    )

    expect(retryOptions.enabled).toBe(true)
    expect(retryOptions.doNotRetry).toEqual([400, 500, 502])

-    expect(requestOptions.retries).toEqual(1)
+    expect(requestOptions?.retries).toEqual(1)
  })

  test('retryOptions.doNotRetry not set if exemptStatusCodes isEmpty', async () => {
-    const [retryOptions, requestOptions] = getRetryOptions(1, [])
+    const [retryOptions, requestOptions] = getRetryOptions(1, [], [])

    expect(retryOptions.enabled).toBe(true)
    expect(retryOptions.doNotRetry).toBeUndefined()

-    expect(requestOptions.retries).toEqual(1)
+    expect(requestOptions?.retries).toEqual(1)
+  })
+
+  test('requestOptions does not override defaults from @actions/github', async () => {
+    const [retryOptions, requestOptions] = getRetryOptions(1, [], {
+      request: {
+        agent: 'default-user-agent'
+      },
+      foo: 'bar'
+    })
+
+    expect(retryOptions.enabled).toBe(true)
+    expect(retryOptions.doNotRetry).toBeUndefined()
+
+    expect(requestOptions?.retries).toEqual(1)
+    expect(requestOptions?.agent).toEqual('default-user-agent')
+    expect(requestOptions?.foo).toBeUndefined() // this should not be in the `options.request` object, but at the same level as `request`
  })
 })
--- a/dist/index.js
+++ b/dist/index.js
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,29 +1,31 @@
 {
  "name": "github-script",
-  "version": "6.3.0",
+  "version": "6.4.0",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "github-script",
-      "version": "6.3.0",
+      "version": "6.4.0",
      "license": "MIT",
      "dependencies": {
-        "@actions/core": "^1.9.1",
+        "@actions/core": "^1.10.0",
        "@actions/exec": "^1.1.0",
        "@actions/github": "^5.0.0",
-        "@actions/glob": "^0.2.0",
+        "@actions/glob": "^0.3.0",
        "@actions/io": "^1.1.1",
        "@octokit/core": "^3.5.1",
        "@octokit/plugin-paginate-rest": "^2.17.0",
        "@octokit/plugin-rest-endpoint-methods": "^6.3.0",
-        "@octokit/plugin-retry": "^3.0.9"
+        "@octokit/plugin-retry": "^3.0.9",
+        "node-fetch": "^2.6.7"
      },
      "devDependencies": {
        "@types/jest": "^27.0.2",
+        "@types/node-fetch": "^2.6.2",
        "@typescript-eslint/eslint-plugin": "^3.10.1",
        "@typescript-eslint/parser": "^3.10.1",
-        "@vercel/ncc": "^0.23.0",
+        "@vercel/ncc": "^0.36.0",
        "eslint": "^7.32.0",
        "eslint-config-prettier": "^6.15.0",
        "husky": "^7.0.0",
@@ -35,9 +37,9 @@
      }
    },
    "node_modules/@actions/core": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.1.tgz",
-      "integrity": "sha512-5ad+U2YGrmmiw6du20AQW5XuWo7UKN2052FjSV7MX+Wfjf8sCqcsZe62NfgHys4QI4/Y+vQvLKYL8jWtA1ZBTA==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz",
+      "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==",
      "dependencies": {
        "@actions/http-client": "^2.0.1",
        "uuid": "^8.3.2"
@@ -52,9 +54,9 @@
      }
    },
    "node_modules/@actions/github": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@actions/github/-/github-5.1.0.tgz",
-      "integrity": "sha512-tuI80F7JQIhg77ZTTgUAPpVD7ZnP9oHSPN8xw7LOwtA4vEMbAjWJNbmLBfV7xua7r016GyjzWLuec5cs8f/a8A==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@actions/github/-/github-5.1.1.tgz",
+      "integrity": "sha512-Nk59rMDoJaV+mHCOJPXuvB1zIbomlKS0dmSIqPGxd0enAXBnOfn4VWF+CGtRCwXZG9Epa54tZA7VIRlJDS8A6g==",
      "dependencies": {
        "@actions/http-client": "^2.0.1",
        "@octokit/core": "^3.6.0",
@@ -75,9 +77,9 @@
      }
    },
    "node_modules/@actions/glob": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@actions/glob/-/glob-0.2.0.tgz",
-      "integrity": "sha512-mqE2a7I66kxcvsdwxs/filQwZsq25IfktMaviGfDB51v6Q3bvxnV7mFsZnvYtLhqGZbPxwBnH8AD3UYaOWb//w==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@actions/glob/-/glob-0.3.0.tgz",
+      "integrity": "sha512-tJP1ZhF87fd6LBnaXWlahkyvdgvsLl7WnreW1EZaC8JWjpMXmzqWzQVe/IEYslrkT9ymibVrKyJN4UMD7uQM2w==",
      "dependencies": {
        "@actions/core": "^1.2.6",
        "minimatch": "^3.0.4"
@@ -1326,6 +1328,16 @@
      "integrity": "sha512-EITwVTX5B4nDjXjGeQAfXOrm+Jn+qNjDmyDRtWoD+wZsl/RDPRTFRKivs4Mt74iOFlLOrE5+Kf+p5yjyhm3+cA==",
      "dev": true
    },
+    "node_modules/@types/node-fetch": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.2.tgz",
+      "integrity": "sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "form-data": "^3.0.0"
+      }
+    },
    "node_modules/@types/prettier": {
      "version": "2.4.1",
      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.1.tgz",
@@ -1519,9 +1531,9 @@
      }
    },
    "node_modules/@vercel/ncc": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.23.0.tgz",
-      "integrity": "sha512-Fcr1qlG9t54X4X9qbo/+jr1+t5Qc6H3TgIRBXmKkF/WDs6YFulAN6ilq2Ehx38RbgIOFxaZnjlAQ50GyexnMpQ==",
+      "version": "0.36.0",
+      "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.36.0.tgz",
+      "integrity": "sha512-/ZTUJ/ZkRt694k7KJNimgmHjtQcRuVwsST2Z6XfYveQIuBbHR+EqkTc1jfgPkQmMyk/vtpxo3nVxe8CNuau86A==",
      "dev": true,
      "bin": {
        "ncc": "dist/ncc/cli.js"
@@ -4511,13 +4523,10 @@
      "dev": true
    },
    "node_modules/json5": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
-      "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
      "bin": {
        "json5": "lib/cli.js"
      },
@@ -4739,9 +4748,9 @@
      }
    },
    "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
      "dependencies": {
        "brace-expansion": "^1.1.7"
      },
@@ -4749,12 +4758,6 @@
        "node": "*"
      }
    },
-    "node_modules/minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
-      "dev": true
-    },
    "node_modules/ms": {
      "version": "2.1.2",
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -4795,17 +4798,17 @@
    "node_modules/node-fetch/node_modules/tr46": {
      "version": "0.0.3",
      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
    },
    "node_modules/node-fetch/node_modules/webidl-conversions": {
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
    },
    "node_modules/node-fetch/node_modules/whatwg-url": {
      "version": "5.0.0",
      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
      "dependencies": {
        "tr46": "~0.0.3",
        "webidl-conversions": "^3.0.0"
@@ -6225,9 +6228,9 @@
  },
  "dependencies": {
    "@actions/core": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.1.tgz",
-      "integrity": "sha512-5ad+U2YGrmmiw6du20AQW5XuWo7UKN2052FjSV7MX+Wfjf8sCqcsZe62NfgHys4QI4/Y+vQvLKYL8jWtA1ZBTA==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz",
+      "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==",
      "requires": {
        "@actions/http-client": "^2.0.1",
        "uuid": "^8.3.2"
@@ -6242,9 +6245,9 @@
      }
    },
    "@actions/github": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@actions/github/-/github-5.1.0.tgz",
-      "integrity": "sha512-tuI80F7JQIhg77ZTTgUAPpVD7ZnP9oHSPN8xw7LOwtA4vEMbAjWJNbmLBfV7xua7r016GyjzWLuec5cs8f/a8A==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@actions/github/-/github-5.1.1.tgz",
+      "integrity": "sha512-Nk59rMDoJaV+mHCOJPXuvB1zIbomlKS0dmSIqPGxd0enAXBnOfn4VWF+CGtRCwXZG9Epa54tZA7VIRlJDS8A6g==",
      "requires": {
        "@actions/http-client": "^2.0.1",
        "@octokit/core": "^3.6.0",
@@ -6264,9 +6267,9 @@
      }
    },
    "@actions/glob": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@actions/glob/-/glob-0.2.0.tgz",
-      "integrity": "sha512-mqE2a7I66kxcvsdwxs/filQwZsq25IfktMaviGfDB51v6Q3bvxnV7mFsZnvYtLhqGZbPxwBnH8AD3UYaOWb//w==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@actions/glob/-/glob-0.3.0.tgz",
+      "integrity": "sha512-tJP1ZhF87fd6LBnaXWlahkyvdgvsLl7WnreW1EZaC8JWjpMXmzqWzQVe/IEYslrkT9ymibVrKyJN4UMD7uQM2w==",
      "requires": {
        "@actions/core": "^1.2.6",
        "minimatch": "^3.0.4"
@@ -7285,6 +7288,16 @@
      "integrity": "sha512-EITwVTX5B4nDjXjGeQAfXOrm+Jn+qNjDmyDRtWoD+wZsl/RDPRTFRKivs4Mt74iOFlLOrE5+Kf+p5yjyhm3+cA==",
      "dev": true
    },
+    "@types/node-fetch": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.2.tgz",
+      "integrity": "sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*",
+        "form-data": "^3.0.0"
+      }
+    },
    "@types/prettier": {
      "version": "2.4.1",
      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.1.tgz",
@@ -7403,9 +7416,9 @@
      }
    },
    "@vercel/ncc": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.23.0.tgz",
-      "integrity": "sha512-Fcr1qlG9t54X4X9qbo/+jr1+t5Qc6H3TgIRBXmKkF/WDs6YFulAN6ilq2Ehx38RbgIOFxaZnjlAQ50GyexnMpQ==",
+      "version": "0.36.0",
+      "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.36.0.tgz",
+      "integrity": "sha512-/ZTUJ/ZkRt694k7KJNimgmHjtQcRuVwsST2Z6XfYveQIuBbHR+EqkTc1jfgPkQmMyk/vtpxo3nVxe8CNuau86A==",
      "dev": true
    },
    "abab": {
@@ -9670,13 +9683,10 @@
      "dev": true
    },
    "json5": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
-      "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.5"
-      }
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true
    },
    "kleur": {
      "version": "3.0.3",
@@ -9848,19 +9858,13 @@
      "dev": true
    },
    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
      "requires": {
        "brace-expansion": "^1.1.7"
      }
    },
-    "minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
-      "dev": true
-    },
    "ms": {
      "version": "2.1.2",
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -9890,17 +9894,17 @@
        "tr46": {
          "version": "0.0.3",
          "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-          "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+          "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
        },
        "webidl-conversions": {
          "version": "3.0.1",
          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-          "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+          "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
        },
        "whatwg-url": {
          "version": "5.0.0",
          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-          "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+          "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
          "requires": {
            "tr46": "~0.0.3",
            "webidl-conversions": "^3.0.0"
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "github-script",
  "description": "A GitHub action for executing a simple script",
-  "version": "6.3.0",
+  "version": "6.4.0",
  "author": "GitHub",
  "license": "MIT",
  "main": "dist/index.js",
@@ -31,21 +31,23 @@
    }
  },
  "dependencies": {
-    "@actions/core": "^1.9.1",
+    "@actions/core": "^1.10.0",
    "@actions/exec": "^1.1.0",
    "@actions/github": "^5.0.0",
-    "@actions/glob": "^0.2.0",
+    "@actions/glob": "^0.3.0",
    "@actions/io": "^1.1.1",
    "@octokit/core": "^3.5.1",
    "@octokit/plugin-paginate-rest": "^2.17.0",
    "@octokit/plugin-rest-endpoint-methods": "^6.3.0",
-    "@octokit/plugin-retry": "^3.0.9"
+    "@octokit/plugin-retry": "^3.0.9",
+    "node-fetch": "^2.6.7"
  },
  "devDependencies": {
    "@types/jest": "^27.0.2",
+    "@types/node-fetch": "^2.6.2",
    "@typescript-eslint/eslint-plugin": "^3.10.1",
    "@typescript-eslint/parser": "^3.10.1",
-    "@vercel/ncc": "^0.23.0",
+    "@vercel/ncc": "^0.36.0",
    "eslint": "^7.32.0",
    "eslint-config-prettier": "^6.15.0",
    "husky": "^7.0.0",
@@ -55,4 +57,4 @@
    "ts-jest": "^27.0.5",
    "typescript": "^4.3.5"
  }
-}
+}
--- a/src/async-function.ts
+++ b/src/async-function.ts
@@ -4,6 +4,7 @@ import {Context} from '@actions/github/lib/context'
 import {GitHub} from '@actions/github/lib/utils'
 import * as glob from '@actions/glob'
 import * as io from '@actions/io'
+import fetch from 'node-fetch'

 const AsyncFunction = Object.getPrototypeOf(async () => null).constructor

@@ -14,6 +15,7 @@ type AsyncFunctionArguments = {
  exec: typeof exec
  glob: typeof glob
  io: typeof io
+  fetch: typeof fetch
  require: NodeRequire
  __original_require__: NodeRequire
 }
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,17 +1,15 @@
 import * as core from '@actions/core'
 import * as exec from '@actions/exec'
 import {context, getOctokit} from '@actions/github'
+import {defaults as defaultGitHubOptions} from '@actions/github/lib/utils'
 import * as glob from '@actions/glob'
 import * as io from '@actions/io'
 import {retry} from '@octokit/plugin-retry'
+import {RequestRequestOptions} from '@octokit/types'
 import {callAsyncFunction} from './async-function'
-import {
-  getRetryOptions,
-  parseNumberArray,
-  RequestOptions,
-  RetryOptions
-} from './retry-options'
+import {getRetryOptions, parseNumberArray, RetryOptions} from './retry-options'
 import {wrapRequire} from './wrap-require'
+import fetch from 'node-fetch'

 process.on('unhandledRejection', handleError)
 main().catch(handleError)
@@ -21,7 +19,7 @@ type Options = {
  userAgent?: string
  previews?: string[]
  retry?: RetryOptions
-  request?: RequestOptions
+  request?: RequestRequestOptions
 }

 async function main(): Promise<void> {
@@ -33,7 +31,11 @@ async function main(): Promise<void> {
  const exemptStatusCodes = parseNumberArray(
    core.getInput('retry-exempt-status-codes')
  )
-  const [retryOpts, requestOpts] = getRetryOptions(retries, exemptStatusCodes)
+  const [retryOpts, requestOpts] = getRetryOptions(
+    retries,
+    exemptStatusCodes,
+    defaultGitHubOptions
+  )

  const opts: Options = {}
  if (debug === 'true') opts.log = console
@@ -55,7 +57,8 @@ async function main(): Promise<void> {
      core,
      exec,
      glob,
-      io
+      io,
+      fetch
    },
    script
  )
--- a/src/retry-options.ts
+++ b/src/retry-options.ts
@@ -1,20 +1,19 @@
 import * as core from '@actions/core'
+import {OctokitOptions} from '@octokit/core/dist-types/types'
+import {RequestRequestOptions} from '@octokit/types'

 export type RetryOptions = {
  doNotRetry?: number[]
  enabled?: boolean
 }

-export type RequestOptions = {
-  retries?: number
-}
-
 export function getRetryOptions(
  retries: number,
-  exemptStatusCodes: number[]
-): [RetryOptions, RequestOptions] {
+  exemptStatusCodes: number[],
+  defaultOptions: OctokitOptions
+): [RetryOptions, RequestRequestOptions | undefined] {
  if (retries <= 0) {
-    return [{enabled: false}, {}]
+    return [{enabled: false}, defaultOptions.request]
  }

  const retryOptions: RetryOptions = {
@@ -25,7 +24,11 @@ export function getRetryOptions(
    retryOptions.doNotRetry = exemptStatusCodes
  }

-  const requestOptions: RequestOptions = {
+  // The GitHub type has some defaults for `options.request`
+  // see: https://github.com/actions/toolkit/blob/4fbc5c941a57249b19562015edbd72add14be93d/packages/github/src/utils.ts#L15
+  // We pass these in here so they are not overidden.
+  const requestOptions: RequestRequestOptions = {
+    ...defaultOptions.request,
    retries
  }
Author	SHA1	Message	Date
Josh Gross	98814c53be	Merge pull request #339 from actions/joshmgross/bump-package-version Bump version to 6.4.0	2023-01-26 11:32:53 -05:00
Josh Gross	ba6cf3fe7c	Bump version to 6.4.0	2023-01-26 11:13:37 -05:00
Josh Gross	bcc389184d	Merge pull request #321 from danmichaelo/node-fetch Add node-fetch	2023-01-26 11:11:58 -05:00
Josh Gross	da8818015e	Merge `main`	2023-01-26 11:05:45 -05:00
Josh Gross	4d93f38890	Update dist and audit deps	2023-01-26 11:04:27 -05:00
Josh Gross	0550e85801	Merge pull request #336 from actions/joshmgross/minimatch-license Update license for minmatch	2023-01-26 10:24:21 -05:00
Josh Gross	5420835fff	Merge branch 'main' into joshmgross/minimatch-license	2023-01-26 10:20:07 -05:00
Josh Gross	03377835c3	Merge pull request #338 from actions/joshmgross/fix-dist Regenerate `dist`	2023-01-26 10:18:09 -05:00
Josh Gross	8c6dda0186	Regenerate `dist`	2023-01-25 19:38:34 -05:00
Josh Gross	ee0d992b06	Use Node 16 in CI and examples	2023-01-25 19:36:14 -05:00
Josh Gross	00be60ac26	Merge pull request #306 from austinvazquez/update-github-actions-packages Update GitHub actions packages	2023-01-25 19:26:12 -05:00
Josh Gross	b7f2567036	Update license for minmatch	2023-01-25 19:20:13 -05:00
Dan Michael O. Heggø	4a65b1d78b	Re-build	2023-01-16 10:00:23 +01:00
Josh Gross	5a2006bc4f	Merge pull request #313 from jongwooo/chore/use-cache-in-check-dist Use cache in check-dist.yml	2023-01-10 14:34:10 -05:00
Josh Gross	b4677cbffd	Merge pull request #320 from actions/dependabot/npm_and_yarn/minimatch-3.1.2 Bump minimatch from 3.0.4 to 3.1.2	2023-01-10 14:33:44 -05:00
Dan Michael O. Heggø	f34078a491	Make node-fetch available	2023-01-07 00:38:19 +01:00
Dan Michael O. Heggø	311d596c3d	Bump ncc	2023-01-07 00:37:32 +01:00
dependabot[bot]	7dc29a470d	Bump minimatch from 3.0.4 to 3.1.2 Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2. - [Release notes](https://github.com/isaacs/minimatch/releases) - [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md) - [Commits](https://github.com/isaacs/minimatch/compare/v3.0.4...v3.1.2) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2023-01-06 21:43:50 +00:00
Josh Gross	570fe7c5f7	Merge pull request #319 from actions/dependabot/npm_and_yarn/json5-2.2.3 Bump json5 from 2.1.3 to 2.2.3	2023-01-06 16:42:44 -05:00
dependabot[bot]	454eac42ff	Bump json5 from 2.1.3 to 2.2.3 Bumps [json5](https://github.com/json5/json5) from 2.1.3 to 2.2.3. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](https://github.com/json5/json5/compare/v2.1.3...v2.2.3) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2023-01-06 02:35:34 +00:00
Jongwoo Han	e0306a3c1d	Use cache in check-dist.yml Signed-off-by: jongwooo <jongwooo.han@gmail.com>	2022-12-07 00:51:52 +09:00
Austin Vazquez	20fcf2e7fe	Update GitHub actions packages Update actions/checkout, actions/setup-node, actions/cache, and actions/upload-artifact from v2 to v3. Signed-off-by: Austin Vazquez <macedonv@amazon.com>	2022-10-25 21:48:09 +00:00
Josh Gross	d556feaca3	Merge pull request #300 from actions/joshmgross/v6.3.3 Update version to 6.3.3	2022-10-13 18:34:27 -04:00
Josh Gross	01fde8b524	Update version to 6.3.3	2022-10-11 17:38:18 -04:00
Josh Gross	633e9fd3a1	Merge pull request #279 from nineinchnick/update-glob Update `@actions/glob` to 0.3.0	2022-10-11 17:37:00 -04:00
Josh Gross	ee124b1288	Update dist	2022-10-11 17:33:09 -04:00
Josh Gross	ca24d5fb29	Update `@actions/glob` license version	2022-10-11 17:31:09 -04:00
Josh Gross	c09747ec1a	Merge branch 'main' into update-glob	2022-10-11 17:29:19 -04:00
Josh Gross	100527700e	Merge pull request #299 from actions/joshmgross/v6.3.2 Bump version to 6.3.2	2022-10-11 11:43:51 -04:00
Josh Gross	085a7754e8	Bump version to 6.3.2	2022-10-11 11:18:09 -04:00
Josh Gross	6871f0ffce	Merge pull request #295 from rentziass/rentziass/update-actions-core Update @actions/core to 1.10.0	2022-10-11 11:16:19 -04:00
Francesco Renzi	7ed718295b	Update @actions/core to 1.10.0	2022-10-06 11:32:55 +01:00
Josh Gross	7dff1a8764	Merge pull request #293 from luketomlinson/main Fix overriding request options from @actions/github	2022-09-30 16:50:50 -04:00
Luke Tomlinson	8445ca871a	Fix overriding request options from @actions/github	2022-09-30 15:15:18 -04:00
Jan Waś	0a9984563e	Update `@actions/glob` to 0.3.0	2022-08-04 23:18:29 +02:00