From 3d9ef23792c499876786878f398ef8054ab1a815 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 12:47:24 +0000 Subject: [PATCH 1/2] Bump the octokit group with 2 updates Bumps the octokit group with 2 updates: [@octokit/plugin-throttling](https://github.com/octokit/plugin-throttling.js) and [@octokit/types](https://github.com/octokit/types.ts). Updates `@octokit/plugin-throttling` from 9.3.1 to 9.3.2 - [Release notes](https://github.com/octokit/plugin-throttling.js/releases) - [Commits](https://github.com/octokit/plugin-throttling.js/compare/v9.3.1...v9.3.2) Updates `@octokit/types` from 13.6.0 to 13.6.1 - [Release notes](https://github.com/octokit/types.ts/releases) - [Commits](https://github.com/octokit/types.ts/compare/v13.6.0...v13.6.1) --- updated-dependencies: - dependency-name: "@octokit/plugin-throttling" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: octokit - dependency-name: "@octokit/types" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: octokit ... Signed-off-by: dependabot[bot] --- package-lock.json | 16 ++++++++-------- package.json | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 21794840d..16b069ee2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "@actions/tool-cache": "^2.0.1", "@octokit/action": "^7.0.0", "@octokit/plugin-retry": "^7.1.2", - "@octokit/plugin-throttling": "^9.3.1", + "@octokit/plugin-throttling": "^9.3.2", "ajv": "8.17.1", "form-data": "^4.0.0", "jszip": "3.10.1", @@ -31,7 +31,7 @@ "@babel/preset-env": "^7.24.4", "@babel/preset-react": "^7.24.1", "@babel/preset-typescript": "^7.21.4", - "@octokit/types": "^13.6.0", + "@octokit/types": "^13.6.1", "@types/archiver": "^6.0.2", "@types/jest": "^29.5.12", "@types/node": "^22.7.4", @@ -3501,9 +3501,9 @@ } }, "node_modules/@octokit/plugin-throttling": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/@octokit/plugin-throttling/-/plugin-throttling-9.3.1.tgz", - "integrity": "sha512-Qd91H4liUBhwLB2h6jZ99bsxoQdhgPk6TdwnClPyTBSDAdviGPceViEgUwj+pcQDmB/rfAXAXK7MTochpHM3yQ==", + "version": "9.3.2", + "resolved": "https://registry.npmjs.org/@octokit/plugin-throttling/-/plugin-throttling-9.3.2.tgz", + "integrity": "sha512-FqpvcTpIWFpMMwIeSoypoJXysSAQ3R+ALJhXXSG1HTP3YZOIeLmcNcimKaXxTcws+Sh6yoRl13SJ5r8sXc1Fhw==", "dependencies": { "@octokit/types": "^13.0.0", "bottleneck": "^2.15.3" @@ -3541,9 +3541,9 @@ } }, "node_modules/@octokit/types": { - "version": "13.6.0", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.0.tgz", - "integrity": "sha512-CrooV/vKCXqwLa+osmHLIMUb87brpgUqlqkPGc6iE2wCkUvTrHiXFMhAKoDDaAAYJrtKtrFTgSQTg5nObBEaew==", + "version": "13.6.1", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.1.tgz", + "integrity": "sha512-PHZE9Z+kWXb23Ndik8MKPirBPziOc0D2/3KH1P+6jK5nGWe96kadZuE4jev2/Jq7FvIfTlT2Ltg8Fv2x1v0a5g==", "dependencies": { "@octokit/openapi-types": "^22.2.0" } diff --git a/package.json b/package.json index bbdc06dc7..d03b0f4fd 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "@actions/tool-cache": "^2.0.1", "@octokit/action": "^7.0.0", "@octokit/plugin-retry": "^7.1.2", - "@octokit/plugin-throttling": "^9.3.1", + "@octokit/plugin-throttling": "^9.3.2", "ajv": "8.17.1", "form-data": "^4.0.0", "jszip": "3.10.1", @@ -38,7 +38,7 @@ "@babel/preset-env": "^7.24.4", "@babel/preset-react": "^7.24.1", "@babel/preset-typescript": "^7.21.4", - "@octokit/types": "^13.6.0", + "@octokit/types": "^13.6.1", "@types/archiver": "^6.0.2", "@types/jest": "^29.5.12", "@types/node": "^22.7.4", From 2c70ff5b5fe10b103ab83145e8142340c8f7579d Mon Sep 17 00:00:00 2001 From: Shati Patel <42641846+shati-patel@users.noreply.github.com> Date: Tue, 8 Oct 2024 12:55:20 +0000 Subject: [PATCH 2/2] Build JS --- dist/query.js | 7 +++++-- dist/update-repo-task-status.js | 7 +++++-- dist/update-repo-task-statuses.js | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dist/query.js b/dist/query.js index 453cfc7ed..f0de517ff 100644 --- a/dist/query.js +++ b/dist/query.js @@ -77256,7 +77256,10 @@ function throttling(octokit, octokitOptions) { if (!enabled) { return {}; } - const common = { connection, timeout }; + const common = { timeout }; + if (typeof connection !== "undefined") { + common.connection = connection; + } if (groups.global == null) { createGroups(Bottleneck2, common); } @@ -77297,7 +77300,7 @@ function throttling(octokit, octokitOptions) { const [state2, request2, options] = info4.args; const { pathname } = new URL(options.url, "http://github.test"); const shouldRetryGraphQL = pathname.startsWith("/graphql") && error2.status !== 401; - if (!(shouldRetryGraphQL || error2.status === 403)) { + if (!(shouldRetryGraphQL || error2.status === 403 || error2.status === 429)) { return; } const retryCount = ~~request2.retryCount; diff --git a/dist/update-repo-task-status.js b/dist/update-repo-task-status.js index 116a2c660..b61d7eeb0 100644 --- a/dist/update-repo-task-status.js +++ b/dist/update-repo-task-status.js @@ -47375,7 +47375,10 @@ function throttling(octokit, octokitOptions) { if (!enabled) { return {}; } - const common = { connection, timeout }; + const common = { timeout }; + if (typeof connection !== "undefined") { + common.connection = connection; + } if (groups.global == null) { createGroups(Bottleneck2, common); } @@ -47416,7 +47419,7 @@ function throttling(octokit, octokitOptions) { const [state2, request2, options] = info.args; const { pathname } = new URL(options.url, "http://github.test"); const shouldRetryGraphQL = pathname.startsWith("/graphql") && error.status !== 401; - if (!(shouldRetryGraphQL || error.status === 403)) { + if (!(shouldRetryGraphQL || error.status === 403 || error.status === 429)) { return; } const retryCount = ~~request2.retryCount; diff --git a/dist/update-repo-task-statuses.js b/dist/update-repo-task-statuses.js index cf7fbdbb7..8f43aa24a 100644 --- a/dist/update-repo-task-statuses.js +++ b/dist/update-repo-task-statuses.js @@ -47377,7 +47377,10 @@ function throttling(octokit, octokitOptions) { if (!enabled) { return {}; } - const common = { connection, timeout }; + const common = { timeout }; + if (typeof connection !== "undefined") { + common.connection = connection; + } if (groups.global == null) { createGroups(Bottleneck2, common); } @@ -47418,7 +47421,7 @@ function throttling(octokit, octokitOptions) { const [state2, request2, options] = info.args; const { pathname } = new URL(options.url, "http://github.test"); const shouldRetryGraphQL = pathname.startsWith("/graphql") && error.status !== 401; - if (!(shouldRetryGraphQL || error.status === 403)) { + if (!(shouldRetryGraphQL || error.status === 403 || error.status === 429)) { return; } const retryCount = ~~request2.retryCount;