Delete all but one `build2` reference (#22391)
This removes all the remaining references to the `build2` directory except for the CI job that stores the artifacts. We'll keep the `build2` artifact until downstream scripts are migrated to `build`.
Andrew Clark committed
Sep 21, 2021 at 16:15 UTC
cf07c3df124fb43dfe14b3068c3a15e05bc4af1c
6 files changed
+4
-28
.circleci/config.yml
+3
-7
@@ -103,9 +103,7 @@ jobs:
103
- run: yarn build-combined
104
- persist_to_workspace:
105
root: .
106
- # TODO: Migrate scripts to use `build` directory instead of `build2`
106
paths:
108
- - build2
107
- build
108
109
get_base_build:
@@ -121,7 +119,7 @@ jobs:
119
git fetch origin main
120
cd ./scripts/release && yarn && cd ../../
121
scripts/release/download-experimental-build.js --commit=$(git merge-base HEAD origin/main)
124
- mv ./build2 ./base-build
122
+ mv ./build ./base-build
123
- persist_to_workspace:
124
root: .
125
paths:
@@ -136,12 +134,11 @@ jobs:
134
at: .
135
- run: yarn workspaces info | head -n -1 > workspace_info.txt
136
- *restore_node_modules
139
- - run: echo "<< pipeline.git.revision >>" >> build2/COMMIT_SHA
137
- run: echo "<< pipeline.git.revision >>" >> build/COMMIT_SHA
138
# Compress build directory into a single tarball for easy download
142
- - run: tar -zcvf ./build2.tgz ./build2
143
- # TODO: Migrate scripts to use `build` directory instead of `build2`
139
- run: tar -zcvf ./build.tgz ./build
140
+ # TODO: Migrate scripts to use `build` directory instead of `build2`
141
+ - run: cp ./build.tgz ./build2.tgz
142
- store_artifacts:
143
path: ./build2.tgz
144
- store_artifacts:
@@ -154,7 +151,6 @@ jobs:
151
- checkout
152
- attach_workspace:
153
at: .
157
- - run: echo "<< pipeline.git.revision >>" >> build2/COMMIT_SHA
154
- run: echo "<< pipeline.git.revision >>" >> build/COMMIT_SHA
155
- run: yarn workspaces info | head -n -1 > workspace_info.txt
156
- *restore_node_modules
.eslintignore
-3
@@ -6,9 +6,6 @@ packages/react-art/npm/lib
6
7
# Build products
8
build/
9
-# TODO: Currently storing artifacts as `./build2` so that it doesn't conflict
10
-# with old build job. Remove once we migrate rest of build/test pipeline.
11
-build2/
9
coverage/
10
fixtures/
11
scripts/bench/benchmarks/**/*.js
.gitignore
+1
-2
@@ -8,7 +8,6 @@ scripts/flow/*/.flowconfig
8
_SpecRunner.html
9
__benchmarks__
10
build/
11
-build2/
11
remote-repo/
12
coverage/
13
.module-cache
@@ -36,4 +35,4 @@ packages/react-devtools-extensions/shared/build
35
packages/react-devtools-extensions/.tempUserDataDir
36
packages/react-devtools-inline/dist
37
packages/react-devtools-shell/dist
39
-packages/react-devtools-scheduling-profiler/dist
\ No newline at end of file
38
+packages/react-devtools-scheduling-profiler/dist
scripts/flow/config/flowconfig
-1
@@ -1,7 +1,6 @@
1
[ignore]
2
.*/scripts/bench/.*
3
.*/build/.*
4
-.*/build2/.*
4
.*/fixtures/.*
5
.*/.tempUserDataDir/.*
6
scripts/release/shared-commands/download-build-artifacts.js
-6
@@ -4,7 +4,6 @@
4
5
const {exec} = require('child-process-promise');
6
const {existsSync} = require('fs');
7
-const fse = require('fs-extra');
7
const {join} = require('path');
8
const {getArtifactsList, logPromise} = require('../utils');
9
const theme = require('../theme');
@@ -31,11 +30,6 @@ const run = async ({build, cwd, releaseChannel}) => {
30
}
31
);
32
34
- // TODO: Currently storing a copy of the artifacts as `./build2`, because
35
- // some scripts reference that directory. Remove once we migrate everything to
36
- // reference `./build` instead.
37
- fse.copySync('./build', './build2');
38
-
33
// Copy to staging directory
34
// TODO: Consider staging the release in a different directory from the CI
35
// build artifacts: `./build/node_modules` -> `./staged-releases`
scripts/rollup/build-all-release-channels.js
-9
@@ -56,11 +56,6 @@ if (process.env.CIRCLE_NODE_TOTAL) {
56
buildForChannel('experimental', nodeTotal, nodeIndex);
57
processExperimental('./build');
58
}
59
-
60
- // TODO: Currently storing a copy of the artifacts as `./build2`, because
61
- // some scripts reference that directory. Remove once we migrate everything to
62
- // reference `./build` instead.
63
- fse.copySync('./build', './build2');
59
} else {
60
// Running locally, no concurrency. Move each channel's build artifacts into
61
// a temporary directory so that they don't conflict.
@@ -87,10 +82,6 @@ if (process.env.CIRCLE_NODE_TOTAL) {
82
83
// Now restore the combined directory back to its original name
84
crossDeviceRenameSync(stableDir, './build');
90
- // TODO: Currently storing a copy of the artifacts as `./build2`, because
91
- // some scripts reference that directory. Remove once we migrate everything to
92
- // reference `./build` instead.
93
- fse.copySync('./build', './build2');
85
}
86
87
function buildForChannel(channel, nodeTotal, nodeIndex) {