{"patch":"diff --git a\/.circleci\/config.yml b\/.circleci\/config.yml\nindex a532fb2e06..75d8f945e9 100644\n--- a\/.circleci\/config.yml\n+++ b\/.circleci\/config.yml\n@@ -1,4 +1,4 @@\n-version: 2\n+version: 2.1\n \n aliases:\n - &docker\n@@ -455,37 +455,20 @@ jobs:\n command: yarn lint-build\n - run: scripts\/circleci\/check_minified_errors.sh\n \n- yarn_test-stable_build:\n- docker: *docker\n- environment: *environment\n- parallelism: *TEST_PARALLELISM\n- steps:\n- - checkout\n- - attach_workspace: *attach_workspace\n- - run: yarn workspaces info | head -n -1 > workspace_info.txt\n- - *restore_node_modules\n- - run: yarn test-stable --build --ci\n-\n yarn_test_build:\n docker: *docker\n environment: *environment\n parallelism: *TEST_PARALLELISM\n+ parameters:\n+ args:\n+ type: string\n steps:\n - checkout\n- - attach_workspace: *attach_workspace\n- - run: yarn workspaces info | head -n -1 > workspace_info.txt\n- - *restore_node_modules\n- - run: yarn test --build --ci\n-\n- yarn_test_build_devtools:\n- docker: *docker\n- environment: *environment\n- steps:\n- - checkout\n- - attach_workspace: *attach_workspace\n+ - attach_workspace:\n+ at: build2\n - run: yarn workspaces info | head -n -1 > workspace_info.txt\n - *restore_node_modules\n- - run: yarn test --project=devtools --build --ci\n+ - run: yarn test --build <> --ci\n \n RELEASE_CHANNEL_stable_yarn_test_dom_fixtures:\n docker: *docker\n@@ -518,28 +501,6 @@ jobs:\n FUZZ_TEST_SEED=$RANDOM yarn test fuzz --ci\n FUZZ_TEST_SEED=$RANDOM yarn test --prod fuzz --ci\n \n- yarn_test-stable_build_prod:\n- docker: *docker\n- environment: *environment\n- parallelism: *TEST_PARALLELISM\n- steps:\n- - checkout\n- - attach_workspace: *attach_workspace\n- - run: yarn workspaces info | head -n -1 > workspace_info.txt\n- - *restore_node_modules\n- - run: yarn test-stable --build --prod --ci\n-\n- yarn_test_build_prod:\n- docker: *docker\n- environment: *environment\n- parallelism: *TEST_PARALLELISM\n- steps:\n- - checkout\n- - attach_workspace: *attach_workspace\n- - run: yarn workspaces info | head -n -1 > workspace_info.txt\n- - *restore_node_modules\n- - run: yarn test --build --prod --ci\n-\n workflows:\n version: 2\n stable:\n@@ -584,12 +545,6 @@ workflows:\n - RELEASE_CHANNEL_stable_yarn_lint_build:\n requires:\n - RELEASE_CHANNEL_stable_yarn_build\n- - yarn_test-stable_build:\n- requires:\n- - RELEASE_CHANNEL_stable_yarn_build\n- - yarn_test-stable_build_prod:\n- requires:\n- - RELEASE_CHANNEL_stable_yarn_build\n - RELEASE_CHANNEL_stable_yarn_test_dom_fixtures:\n requires:\n - RELEASE_CHANNEL_stable_yarn_build\n@@ -624,18 +579,9 @@ workflows:\n - sizebot_experimental:\n requires:\n - yarn_build\n- - yarn_test_build:\n- requires:\n- - yarn_build\n- - yarn_test_build_prod:\n- requires:\n- - yarn_build\n - yarn_lint_build:\n requires:\n - yarn_build\n- - yarn_test_build_devtools:\n- requires:\n- - yarn_build\n - build_devtools_and_process_artifacts:\n requires:\n - yarn_build\n@@ -660,6 +606,32 @@ workflows:\n - process_artifacts_combined:\n requires:\n - yarn_build_combined\n+ - yarn_test_build:\n+ requires:\n+ - yarn_build_combined\n+ matrix:\n+ parameters:\n+ args:\n+ # Intentionally passing these as strings instead of creating a\n+ # separate parameter per CLI argument, since it's easier to\n+ # control\/see which combinations we want to run.\n+ - \"-r=stable --env=development\"\n+ - \"-r=stable --env=production\"\n+ - \"-r=experimental --env=development\"\n+ - \"-r=experimental --env=production\"\n+\n+ # Dev Tools\n+ - \"--project=devtools -r=experimental\"\n+\n+ # TODO: Update test config to support www build tests\n+ # - \"-r=www-classic --env=development\"\n+ # - \"-r=www-classic --env=production\"\n+ # - \"-r=www-classic --env=development --variant\"\n+ # - \"-r=www-classic --env=production --variant\"\n+ # - \"-r=www-modern --env=development\"\n+ # - \"-r=www-modern --env=production\"\n+ # - \"-r=www-modern --env=development --variant\"\n+ # - \"-r=www-modern --env=production --variant\"\n \n fuzz_tests:\n triggers:\ndiff --git a\/scripts\/jest\/config.build-devtools.js b\/scripts\/jest\/config.build-devtools.js\nindex 39985e7416..0d5a6039e4 100644\n--- a\/scripts\/jest\/config.build-devtools.js\n+++ b\/scripts\/jest\/config.build-devtools.js\n@@ -4,6 +4,9 @@ const {readdirSync, statSync} = require('fs');\n const {join} = require('path');\n const baseConfig = require('.\/config.base');\n \n+const NODE_MODULES_DIR =\n+ process.env.RELEASE_CHANNEL === 'stable' ? 'oss-stable' : 'oss-experimental';\n+\n \/\/ Find all folders in packages\/* with package.json\n const packagesRoot = join(__dirname, '..', '..', 'packages');\n const packages = readdirSync(packagesRoot).filter(dir => {\n@@ -32,11 +35,13 @@ moduleNameMapper['react-devtools-feature-flags'] =\n \/\/ Map packages to bundles\n packages.forEach(name => {\n \/\/ Root entry point\n- moduleNameMapper[`^${name}$`] = `\/build\/node_modules\/${name}`;\n+ moduleNameMapper[\n+ `^${name}$`\n+ ] = `\/build2\/${NODE_MODULES_DIR}\/${name}`;\n \/\/ Named entry points\n moduleNameMapper[\n `^${name}\\\/([^\\\/]+)$`\n- ] = `\/build\/node_modules\/${name}\/$1`;\n+ ] = `\/build2\/${NODE_MODULES_DIR}\/${name}\/$1`;\n });\n \n \/\/ Allow tests to import shared code (e.g. feature flags, getStackByFiberInDevAndProd)\n@@ -50,7 +55,7 @@ module.exports = Object.assign({}, baseConfig, {\n \/\/ Don't run bundle tests on -test.internal.* files\n testPathIgnorePatterns: ['\/node_modules\/', '-test.internal.js$'],\n \/\/ Exclude the build output from transforms\n- transformIgnorePatterns: ['\/node_modules\/', '\/build\/'],\n+ transformIgnorePatterns: ['\/node_modules\/', '\/build2\/'],\n testRegex: 'packages\/react-devtools-shared\/src\/__tests__\/[^]+.test.js$',\n snapshotSerializers: [\n require.resolve(\ndiff --git a\/scripts\/jest\/config.build.js b\/scripts\/jest\/config.build.js\nindex fe83740fa4..95bc0e633c 100644\n--- a\/scripts\/jest\/config.build.js\n+++ b\/scripts\/jest\/config.build.js\n@@ -6,6 +6,9 @@ const baseConfig = require('.\/config.base');\n \n process.env.IS_BUILD = true;\n \n+const NODE_MODULES_DIR =\n+ process.env.RELEASE_CHANNEL === 'stable' ? 'oss-stable' : 'oss-experimental';\n+\n \/\/ Find all folders in packages\/* with package.json\n const packagesRoot = join(__dirname, '..', '..', 'packages');\n const packages = readdirSync(packagesRoot).filter(dir => {\n@@ -35,11 +38,13 @@ moduleNameMapper[\n \/\/ Map packages to bundles\n packages.forEach(name => {\n \/\/ Root entry point\n- moduleNameMapper[`^${name}$`] = `\/build\/node_modules\/${name}`;\n+ moduleNameMapper[\n+ `^${name}$`\n+ ] = `\/build2\/${NODE_MODULES_DIR}\/${name}`;\n \/\/ Named entry points\n moduleNameMapper[\n `^${name}\\\/([^\\\/]+)$`\n- ] = `\/build\/node_modules\/${name}\/$1`;\n+ ] = `\/build2\/${NODE_MODULES_DIR}\/${name}\/$1`;\n });\n \n module.exports = Object.assign({}, baseConfig, {\n@@ -52,7 +57,7 @@ module.exports = Object.assign({}, baseConfig, {\n \/\/ Don't run bundle tests on -test.internal.* files\n testPathIgnorePatterns: ['\/node_modules\/', '-test.internal.js$'],\n \/\/ Exclude the build output from transforms\n- transformIgnorePatterns: ['\/node_modules\/', '\/build\/'],\n+ transformIgnorePatterns: ['\/node_modules\/', '\/build2\/'],\n setupFiles: [\n ...baseConfig.setupFiles,\n require.resolve('.\/setupTests.build.js'),\ndiff --git a\/scripts\/jest\/jest-cli.js b\/scripts\/jest\/jest-cli.js\nindex 19e3879c77..76fdd7e675 100644\n--- a\/scripts\/jest\/jest-cli.js\n+++ b\/scripts\/jest\/jest-cli.js\n@@ -212,10 +212,10 @@ function validateOptions() {\n \n if (argv.build) {\n \/\/ TODO: We could build this if it hasn't been built yet.\n- const buildDir = path.resolve('.\/build');\n+ const buildDir = path.resolve('.\/build2');\n if (!fs.existsSync(buildDir)) {\n logError(\n- 'Build directory does not exist, please run `yarn build` or remove the --build option.'\n+ 'Build directory does not exist, please run `yarn build-combined` or remove the --build option.'\n );\n success = false;\n } else if (Date.now() - fs.statSync(buildDir).mtimeMs > 1000 * 60 * 15) {\n","commit":{"authorEmail":"git@andrewclark.io","shortRevision":"9a6a41d108","authorName":"Andrew Clark","authoredAt":"2021-01-12T11:50:38-06:00","subject":"Migrate build tests to combined workflow (#20574)","revision":"9a6a41d108e1bb7c4babebebad7e72daa22a2374"},"body":"","parents":["eb0fb382308f18460844d646dada2e564f82353d"],"files":[{"status":"M","path":".circleci\/config.yml"},{"status":"M","path":"scripts\/jest\/config.build-devtools.js"},{"status":"M","path":"scripts\/jest\/config.build.js"},{"status":"M","path":"scripts\/jest\/jest-cli.js"}]}

dillon1000/react

Files changed