Move build_devtools_and_process_artifacts (facebook#22388)

This is the last CI job that needs to be migrated to the new workflow.
zhengjitf · Apr 15, 2022 · 720c91b · 720c91b
1 parent 9819feb
commit 720c91b
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 18 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -213,9 +213,9 @@ jobs:
     environment: *environment
     steps:
       - checkout
-      - attach_workspace: *attach_workspace
+      - attach_workspace:
+          at: .
       - run: yarn workspaces info | head -n -1 > workspace_info.txt
-      - *restore_yarn_cache
       - *restore_node_modules
       - run:
           name: Install Packages
@@ -344,17 +344,6 @@ jobs:
 workflows:
   version: 2
 
-  experimental:
-    unless: << pipeline.parameters.prerelease_commit_sha >>
-    jobs:
-      - setup
-      - yarn_build:
-          requires:
-            - setup
-      - build_devtools_and_process_artifacts:
-          requires:
-            - yarn_build
-
   # New workflow that will replace "stable" and "experimental"
   build_and_test:
     unless: << pipeline.parameters.prerelease_commit_sha >>
@@ -451,6 +440,10 @@ workflows:
       - RELEASE_CHANNEL_stable_yarn_test_dom_fixtures:
           requires:
             - yarn_build_combined
+      - build_devtools_and_process_artifacts:
+          requires:
+            - yarn_build_combined
+
   fuzz_tests:
     unless: << pipeline.parameters.prerelease_commit_sha >>
     triggers:

diff --git a/packages/react-devtools-core/webpack.backend.js b/packages/react-devtools-core/webpack.backend.js
@@ -18,7 +18,13 @@ if (!NODE_ENV) {
   process.exit(1);
 }
 
-const builtModulesDir = resolve(__dirname, '..', '..', 'build', 'node_modules');
+const builtModulesDir = resolve(
+  __dirname,
+  '..',
+  '..',
+  'build2',
+  'oss-experimental',
+);
 
 const __DEV__ = NODE_ENV === 'development';
 

diff --git a/packages/react-devtools-core/webpack.standalone.js b/packages/react-devtools-core/webpack.standalone.js
@@ -18,7 +18,13 @@ if (!NODE_ENV) {
   process.exit(1);
 }
 
-const builtModulesDir = resolve(__dirname, '..', '..', 'build', 'node_modules');
+const builtModulesDir = resolve(
+  __dirname,
+  '..',
+  '..',
+  'build2',
+  'oss-experimental',
+);
 
 const __DEV__ = NODE_ENV === 'development';
 

diff --git a/packages/react-devtools-extensions/webpack.backend.js b/packages/react-devtools-extensions/webpack.backend.js
@@ -20,7 +20,13 @@ if (!NODE_ENV) {
   process.exit(1);
 }
 
-const builtModulesDir = resolve(__dirname, '..', '..', 'build', 'node_modules');
+const builtModulesDir = resolve(
+  __dirname,
+  '..',
+  '..',
+  'build2',
+  'oss-experimental',
+);
 
 const __DEV__ = NODE_ENV === 'development';
 

diff --git a/packages/react-devtools-extensions/webpack.config.js b/packages/react-devtools-extensions/webpack.config.js
@@ -20,7 +20,13 @@ if (!NODE_ENV) {
   process.exit(1);
 }
 
-const builtModulesDir = resolve(__dirname, '..', '..', 'build', 'node_modules');
+const builtModulesDir = resolve(
+  __dirname,
+  '..',
+  '..',
+  'build2',
+  'oss-experimental',
+);
 
 const __DEV__ = NODE_ENV === 'development';
 

diff --git a/packages/react-devtools-shell/webpack.config.js b/packages/react-devtools-shell/webpack.config.js
@@ -24,7 +24,13 @@ if (!TARGET) {
   process.exit(1);
 }
 
-const builtModulesDir = resolve(__dirname, '..', '..', 'build', 'node_modules');
+const builtModulesDir = resolve(
+  __dirname,
+  '..',
+  '..',
+  'build2',
+  'oss-experimental',
+);
 
 const __DEV__ = NODE_ENV === 'development';