Unverified Commit eb86d82e authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

fix benchmark directory (#73057)

### What?

The bench need to run in the correct directory
parent d434b4ce
...@@ -8,7 +8,7 @@ const nextConfig = { ...@@ -8,7 +8,7 @@ const nextConfig = {
}, },
experimental: { experimental: {
turbo: { turbo: {
unstablePersistentCaching: process.env.TURBO_CACHE ? 1 : false, unstablePersistentCaching: process.env.TURBO_CACHE ? true : false,
}, },
}, },
} }
......
...@@ -26,7 +26,7 @@ const GIT_BRANCH = ...@@ -26,7 +26,7 @@ const GIT_BRANCH =
})()) })())
const nextBuildWorkflow = const nextBuildWorkflow =
(benchmarkName, pages, enableTurbopackCache) => (benchmarkName, benchDir, pages, enableTurbopackCache) =>
async ({ turbopack, page }) => { async ({ turbopack, page }) => {
const pageConfig = const pageConfig =
typeof pages[page] === 'string' ? { url: pages[page] } : pages[page] typeof pages[page] === 'string' ? { url: pages[page] } : pages[page]
...@@ -47,7 +47,7 @@ const nextBuildWorkflow = ...@@ -47,7 +47,7 @@ const nextBuildWorkflow =
__NEXT_TEST_MODE: '1', __NEXT_TEST_MODE: '1',
} }
const benchmarkDir = resolve(REPO_ROOT, 'bench', benchmarkName) const benchmarkDir = resolve(REPO_ROOT, 'bench', benchDir)
// cleanup .next directory to remove persistent cache // cleanup .next directory to remove persistent cache
await retry(() => await retry(() =>
...@@ -233,13 +233,13 @@ const nextBuildWorkflow = ...@@ -233,13 +233,13 @@ const nextBuildWorkflow =
} }
const nextDevWorkflow = const nextDevWorkflow =
(benchmarkName, pages) => (benchmarkName, benchDir, pages) =>
async ({ turbopack, page }) => { async ({ turbopack, page }) => {
const pageConfig = const pageConfig =
typeof pages[page] === 'string' ? { url: pages[page] } : pages[page] typeof pages[page] === 'string' ? { url: pages[page] } : pages[page]
const cleanupTasks = [] const cleanupTasks = []
try { try {
const benchmarkDir = resolve(REPO_ROOT, 'bench', benchmarkName) const benchmarkDir = resolve(REPO_ROOT, 'bench', benchDir)
// cleanup .next directory to remove persistent cache // cleanup .next directory to remove persistent cache
await retry(() => await retry(() =>
...@@ -565,7 +565,7 @@ describe( ...@@ -565,7 +565,7 @@ describe(
mode: 'dev', mode: 'dev',
page: Object.keys(pages), page: Object.keys(pages),
}, },
nextDevWorkflow('heavy-npm-deps', pages) nextDevWorkflow('heavy-npm-deps', 'heavy-npm-deps', pages)
) )
describe( describe(
...@@ -575,7 +575,7 @@ describe( ...@@ -575,7 +575,7 @@ describe(
mode: 'build', mode: 'build',
page: Object.keys(pages), page: Object.keys(pages),
}, },
nextBuildWorkflow('heavy-npm-deps', pages, false) nextBuildWorkflow('heavy-npm-deps', 'heavy-npm-deps', pages, false)
) )
describe( describe(
...@@ -585,7 +585,12 @@ describe( ...@@ -585,7 +585,12 @@ describe(
mode: 'build', mode: 'build',
page: Object.keys(pages), page: Object.keys(pages),
}, },
nextBuildWorkflow('heavy-npm-deps-build-turbo-cache-enabled', pages, true) nextBuildWorkflow(
'heavy-npm-deps-build-turbo-cache-enabled',
'heavy-npm-deps',
pages,
true
)
) )
async function retry(fn) { async function retry(fn) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment