Skip to content

Commit

Permalink
Move DOM fixtures test job to main CI workflow (#22385)
Browse files Browse the repository at this point in the history
Moves the RELEASE_CHANNEL_stable_yarn_test_dom_fixtures job to our new,
combined CI workflow.

After this, there are only two jobs remaining to be migrated. Then we
can delete the old workflow and build script.
  • Loading branch information
acdlite committed Sep 21, 2021
1 parent cb6c619 commit fc57432
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
9 changes: 5 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,8 @@ jobs:
environment: *environment
steps:
- checkout
- attach_workspace: *attach_workspace
- attach_workspace:
at: .
- run: yarn workspaces info | head -n -1 > workspace_info.txt
- *restore_node_modules
- run:
Expand Down Expand Up @@ -352,9 +353,6 @@ workflows:
- RELEASE_CHANNEL_stable_yarn_build:
requires:
- setup
- RELEASE_CHANNEL_stable_yarn_test_dom_fixtures:
requires:
- RELEASE_CHANNEL_stable_yarn_build

experimental:
unless: << pipeline.parameters.prerelease_commit_sha >>
Expand Down Expand Up @@ -457,6 +455,9 @@ workflows:
- yarn_lint_build:
requires:
- yarn_build_combined
- RELEASE_CHANNEL_stable_yarn_test_dom_fixtures:
requires:
- yarn_build_combined
fuzz_tests:
unless: << pipeline.parameters.prerelease_commit_sha >>
triggers:
Expand Down
2 changes: 1 addition & 1 deletion fixtures/dom/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"scripts": {
"start": "react-scripts start",
"prestart": "cp ../../build/node_modules/scheduler/umd/scheduler-unstable_mock.development.js ../../build/node_modules/scheduler/umd/scheduler-unstable_mock.production.min.js ../../build/node_modules/react/umd/react.development.js ../../build/node_modules/react-dom/umd/react-dom.development.js ../../build/node_modules/react/umd/react.production.min.js ../../build/node_modules/react-dom/umd/react-dom.production.min.js ../../build/node_modules/react-dom/umd/react-dom-server.browser.development.js ../../build/node_modules/react-dom/umd/react-dom-server.browser.production.min.js ../../build/node_modules/react-dom/umd/react-dom-test-utils.development.js ../../build/node_modules/react-dom/umd/react-dom-test-utils.production.min.js public/ && cp -a ../../build/node_modules/. node_modules",
"prestart": "cp ../../build2/oss-stable/scheduler/umd/scheduler-unstable_mock.development.js ../../build2/oss-stable/scheduler/umd/scheduler-unstable_mock.production.min.js ../../build2/oss-stable/react/umd/react.development.js ../../build2/oss-stable/react-dom/umd/react-dom.development.js ../../build2/oss-stable/react/umd/react.production.min.js ../../build2/oss-stable/react-dom/umd/react-dom.production.min.js ../../build2/oss-stable/react-dom/umd/react-dom-server.browser.development.js ../../build2/oss-stable/react-dom/umd/react-dom-server.browser.production.min.js ../../build2/oss-stable/react-dom/umd/react-dom-test-utils.development.js ../../build2/oss-stable/react-dom/umd/react-dom-test-utils.production.min.js public/ && cp -a ../../build2/oss-stable/. node_modules",
"build": "react-scripts build && cp build/index.html build/200.html",
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject"
Expand Down

0 comments on commit fc57432

Please sign in to comment.