diff --git a/.github/workflow-scripts/__tests__/publishTemplate-test.js b/.github/workflow-scripts/__tests__/publishTemplate-test.js index 3ea6a1cb90c..9ddc6001680 100644 --- a/.github/workflow-scripts/__tests__/publishTemplate-test.js +++ b/.github/workflow-scripts/__tests__/publishTemplate-test.js @@ -22,10 +22,13 @@ jest.mock('../utils.js', () => ({ log: silence, run: mockRun, sleep: mockSleep, - verifyPublishedPackage: mockVerifyPublishedPackage, getNpmPackageInfo: mockGetNpmPackageInfo, })); +jest.mock('../verifyPublishedPackage.js', () => ({ + verifyPublishedPackage: mockVerifyPublishedPackage, +})); + const getMockGithub = () => ({ rest: { actions: { diff --git a/.github/workflow-scripts/__tests__/verifyReleaseOnNpm-test.js b/.github/workflow-scripts/__tests__/verifyReleaseOnNpm-test.js index 1d3307f6ae7..4850e256b5a 100644 --- a/.github/workflow-scripts/__tests__/verifyReleaseOnNpm-test.js +++ b/.github/workflow-scripts/__tests__/verifyReleaseOnNpm-test.js @@ -13,6 +13,11 @@ const mockVerifyPublishedPackage = jest.fn(); const silence = () => {}; jest.mock('../utils.js', () => ({ + log: silence, + sleep: silence, +})); + +jest.mock('../verifyPublishedPackage.js', () => ({ verifyPublishedPackage: mockVerifyPublishedPackage, })); diff --git a/.github/workflow-scripts/publishTemplate.js b/.github/workflow-scripts/publishTemplate.js index d112922c11d..2119446b3ec 100644 --- a/.github/workflow-scripts/publishTemplate.js +++ b/.github/workflow-scripts/publishTemplate.js @@ -7,7 +7,8 @@ * @format */ -const {run, sleep, log, verifyPublishedPackage} = require('./utils.js'); +const {run, sleep, log} = require('./utils.js'); +const {verifyPublishedPackage} = require('./verifyPublishedPackage.js'); const TAG_AS_LATEST_REGEX = /#publish-packages-to-npm&latest/; diff --git a/.github/workflow-scripts/utils.js b/.github/workflow-scripts/utils.js index fdc13b9f0fc..3ed45477521 100644 --- a/.github/workflow-scripts/utils.js +++ b/.github/workflow-scripts/utils.js @@ -9,13 +9,7 @@ const {execSync} = require('child_process'); -function run(cmd) { - return execSync(cmd, 'utf8').toString().trim(); -} - -async function sleep(seconds) { - return new Promise(resolve => setTimeout(resolve, seconds * 1000)); -} +const log = (...args) => console.log(...args); async function getNpmPackageInfo(pkg, versionOrTag) { return fetch(`https://registry.npmjs.org/${pkg}/${versionOrTag}`).then(resp => @@ -23,7 +17,13 @@ async function getNpmPackageInfo(pkg, versionOrTag) { ); } -const log = (...args) => console.log(...args); +async function sleep(seconds) { + return new Promise(resolve => setTimeout(resolve, seconds * 1000)); +} + +function run(cmd) { + return execSync(cmd, 'utf8').toString().trim(); +} module.exports = { log, diff --git a/.github/workflow-scripts/verifyPublishedPackage.js b/.github/workflow-scripts/verifyPublishedPackage.js index 825300d9b0e..b7358b9b253 100644 --- a/.github/workflow-scripts/verifyPublishedPackage.js +++ b/.github/workflow-scripts/verifyPublishedPackage.js @@ -42,7 +42,7 @@ async function verifyPublishedPackage( } log( - `🐌 ${packageName}@${tag} → ${pkg.version} on npm and not ${version} as expected, retrying...`, + `🐌 ${packageName}@${tag} → ${json.version} on npm and not ${version} as expected, retrying...`, ); } catch (e) { log(`Nope, fetch failed: ${e.message}`); diff --git a/.github/workflow-scripts/verifyReleaseOnNpm.js b/.github/workflow-scripts/verifyReleaseOnNpm.js index b9352233959..1472f7950e6 100644 --- a/.github/workflow-scripts/verifyReleaseOnNpm.js +++ b/.github/workflow-scripts/verifyReleaseOnNpm.js @@ -7,7 +7,8 @@ * @format */ -const {run, sleep, log, verifyPublishedPackage} = require('./utils.js'); +const {run, sleep, log} = require('./utils.js'); +const {verifyPublishedPackage} = require('./verifyPublishedPackage.js'); const REACT_NATIVE_NPM_PKG = 'react-native'; const MAX_RETRIES = 3 * 6; // 18 attempts. Waiting between attempt: 10 s. Total time: 3 mins. /**