From a9da0c8681acb9b4c0c277bb904a386ec5cb9085 Mon Sep 17 00:00:00 2001 From: Robert Sese Date: Tue, 4 Jan 2022 15:00:47 -0600 Subject: [PATCH 1/2] Singular script directory (#24052) --- .github/workflows/triage-unallowed-contributions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/triage-unallowed-contributions.yml b/.github/workflows/triage-unallowed-contributions.yml index 8d0bc42442..0cb30cdd6f 100644 --- a/.github/workflows/triage-unallowed-contributions.yml +++ b/.github/workflows/triage-unallowed-contributions.yml @@ -21,7 +21,7 @@ on: - 'lib/search/indexes/**' - 'package*.json' - 'Procfile' - - 'scripts/**' + - 'script/**' - 'translations/**' permissions: From cfbc6f694fd7a7777d48fe90ae27b05d02ca8b3f Mon Sep 17 00:00:00 2001 From: Mike Surowiec Date: Tue, 4 Jan 2022 15:06:04 -0600 Subject: [PATCH 2/2] remove await-sleep, less reliant on external pkgs (#24033) --- package-lock.json | 13 ------------- package.json | 1 - script/deployment/deploy-to-production.js | 3 ++- script/deployment/purge-edge-cache.js | 3 ++- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 63f1f96b9f..7f581bc232 100644 --- a/package-lock.json +++ b/package-lock.json @@ -118,7 +118,6 @@ "@typescript-eslint/eslint-plugin": "^4.33.0", "@typescript-eslint/parser": "^4.31.1", "async": "^3.2.2", - "await-sleep": "0.0.1", "babel-loader": "^8.2.3", "babel-plugin-styled-components": "^2.0.2", "babel-preset-env": "^1.7.0", @@ -5031,12 +5030,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/await-sleep": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/await-sleep/-/await-sleep-0.0.1.tgz", - "integrity": "sha512-H3X3eAxwGpeNIk/yvFOs8g7500Q1YvzrxjSC9TNgLGtjrMFxPwhDdcT34QNs2iGWpZ+5WKkMJdjDoYs+Sw+TaA==", - "dev": true - }, "node_modules/aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", @@ -27050,12 +27043,6 @@ "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==" }, - "await-sleep": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/await-sleep/-/await-sleep-0.0.1.tgz", - "integrity": "sha512-H3X3eAxwGpeNIk/yvFOs8g7500Q1YvzrxjSC9TNgLGtjrMFxPwhDdcT34QNs2iGWpZ+5WKkMJdjDoYs+Sw+TaA==", - "dev": true - }, "aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", diff --git a/package.json b/package.json index c4e5bf3fd5..8e734e0082 100644 --- a/package.json +++ b/package.json @@ -120,7 +120,6 @@ "@typescript-eslint/eslint-plugin": "^4.33.0", "@typescript-eslint/parser": "^4.31.1", "async": "^3.2.2", - "await-sleep": "0.0.1", "babel-loader": "^8.2.3", "babel-plugin-styled-components": "^2.0.2", "babel-preset-env": "^1.7.0", diff --git a/script/deployment/deploy-to-production.js b/script/deployment/deploy-to-production.js index 14d8990bd0..b23482bc98 100755 --- a/script/deployment/deploy-to-production.js +++ b/script/deployment/deploy-to-production.js @@ -1,9 +1,10 @@ #!/usr/bin/env node -import sleep from 'await-sleep' import got from 'got' import Heroku from 'heroku-client' import { setOutput } from '@actions/core' +const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms)) + const SLEEP_INTERVAL = 5000 const HEROKU_LOG_LINES_TO_SHOW = 25 const DELAY_FOR_PREBOOT_SWAP = 135000 // 2:15 diff --git a/script/deployment/purge-edge-cache.js b/script/deployment/purge-edge-cache.js index e46972452b..8b6c5feb97 100644 --- a/script/deployment/purge-edge-cache.js +++ b/script/deployment/purge-edge-cache.js @@ -1,6 +1,7 @@ -import sleep from 'await-sleep' import got from 'got' +const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms)) + const ONE_SECOND = 1000 async function purgeFastlyBySurrogateKey({ apiToken, serviceId, surrogateKey }) {