Skip to content

Commit be34852

Browse files
lunaleapsfacebook-github-bot
authored andcommitted
Delete validation in set-rn-version (#37814)
Summary: Pull Request resolved: #37814 Changelog: [Internal] - deleting file validation, do we need this? Reviewed By: NickGerleman Differential Revision: D46584771 fbshipit-source-id: 69a8853872b2b1582318a2e65d9919e2b50b2475
1 parent 31eb235 commit be34852

File tree

2 files changed

+2
-88
lines changed

2 files changed

+2
-88
lines changed

scripts/__tests__/set-rn-version-test.js

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
* @format
88
*/
99

10-
const execMock = jest.fn();
1110
const echoMock = jest.fn();
1211
const catMock = jest.fn();
1312
const sedMock = jest.fn();
@@ -16,23 +15,15 @@ const updateTemplatePackageMock = jest.fn();
1615

1716
jest
1817
.mock('shelljs', () => ({
19-
exec: execMock,
2018
echo: echoMock,
2119
cat: catMock,
2220
sed: sedMock,
2321
}))
2422
.mock('./../update-template-package', () => updateTemplatePackageMock)
25-
.mock('./../scm-utils', () => ({
26-
saveFiles: jest.fn(),
27-
}))
28-
.mock('path', () => ({
29-
join: () => '../packages/react-native',
30-
}))
3123
.mock('fs', () => ({
3224
writeFileSync: writeFileSyncMock,
3325
mkdtempSync: () => './rn-set-version/',
34-
}))
35-
.mock('os');
26+
}));
3627

3728
const setReactNativeVersion = require('../set-rn-version');
3829

@@ -58,7 +49,6 @@ describe('set-rn-version', () => {
5849
}
5950
});
6051

61-
execMock.mockReturnValueOnce({stdout: 'line1\nline2\nline3\n'});
6252
sedMock.mockReturnValueOnce({code: 0});
6353

6454
const version = '0.81.0-nightly-29282302-abcd1234';
@@ -115,7 +105,6 @@ describe('set-rn-version', () => {
115105
return 'exports.version = {major: ${major}, minor: ${minor}, patch: ${patch}, prerelease: ${prerelease}}';
116106
});
117107

118-
execMock.mockReturnValueOnce({stdout: 'line1\nline2\nline3\n'});
119108
sedMock.mockReturnValueOnce({code: 0});
120109

121110
const version = '0.81.0';
@@ -144,38 +133,5 @@ describe('set-rn-version', () => {
144133
expect(updateTemplatePackageMock).toHaveBeenCalledWith({
145134
'react-native': version,
146135
});
147-
expect(execMock.mock.calls[0][0]).toBe(
148-
`diff -r ./rn-set-version/ . | grep '^[>]' | grep -c ${version} `,
149-
);
150-
});
151-
152-
it('should fail validation', () => {
153-
catMock.mockReturnValue('{}');
154-
155-
execMock.mockReturnValueOnce({stdout: 'line1\nline2\n'});
156-
sedMock.mockReturnValueOnce({code: 0});
157-
const filesToValidate = [
158-
'packages/react-native/package.json',
159-
'packages/react-native/template/package.json',
160-
];
161-
162-
const version = '0.81.0';
163-
setReactNativeVersion(version, null, 'release');
164-
165-
expect(echoMock).toHaveBeenNthCalledWith(
166-
1,
167-
'The tmp versioning folder is ./rn-set-version/',
168-
);
169-
170-
expect(echoMock).toHaveBeenNthCalledWith(2, 'WARNING:');
171-
172-
expect(echoMock.mock.calls[2][0]).toBe(
173-
`Failed to update all the files: [${filesToValidate.join(
174-
', ',
175-
)}] must have versions in them`,
176-
);
177-
expect(echoMock.mock.calls[3][0]).toBe(
178-
`These files already had version ${version} set.`,
179-
);
180136
});
181137
});

scripts/set-rn-version.js

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,9 @@
1010
'use strict';
1111

1212
const fs = require('fs');
13-
const os = require('os');
14-
const path = require('path');
15-
const {cat, echo, exec, exit, sed} = require('shelljs');
13+
const {cat, echo, exit, sed} = require('shelljs');
1614
const yargs = require('yargs');
1715
const {parseVersion, validateBuildType} = require('./version-utils');
18-
const {saveFiles} = require('./scm-utils');
1916
const updateTemplatePackage = require('./update-template-package');
2017
const {applyPackageVersions} = require('./npm-utils');
2118

@@ -152,23 +149,6 @@ function setReactNativeVersion(argVersion, dependencyVersions, buildType) {
152149

153150
const version = parseVersion(argVersion, buildType);
154151

155-
// Create tmp folder for copies of files to verify files have changed
156-
const filesToValidate = [
157-
'packages/react-native/package.json',
158-
'packages/react-native/template/package.json',
159-
];
160-
const tmpVersioningFolder = fs.mkdtempSync(
161-
path.join(os.tmpdir(), 'rn-set-version'),
162-
);
163-
echo(`The tmp versioning folder is ${tmpVersioningFolder}`);
164-
saveFiles(
165-
[
166-
'packages/react-native/package.json',
167-
'packages/react-native/template/package.json',
168-
],
169-
tmpVersioningFolder,
170-
);
171-
172152
setSource(version);
173153
setPackage(version, dependencyVersions);
174154

@@ -179,28 +159,6 @@ function setReactNativeVersion(argVersion, dependencyVersions, buildType) {
179159
updateTemplatePackage(templateDependencyVersions);
180160

181161
setGradle(version);
182-
183-
// Validate changes
184-
// We just do a git diff and check how many times version is added across files
185-
const numberOfChangedLinesWithNewVersion = exec(
186-
`diff -r ${tmpVersioningFolder} . | grep '^[>]' | grep -c ${version.version} `,
187-
{silent: true},
188-
).stdout.trim();
189-
190-
if (+numberOfChangedLinesWithNewVersion !== filesToValidate.length) {
191-
// TODO: the logic that checks whether all the changes have been applied
192-
// is missing several files. For example, it is not checking Ruby version nor that
193-
// the Objecive-C files, the codegen and other files are properly updated.
194-
// We are going to work on this in another PR.
195-
echo('WARNING:');
196-
echo(
197-
`Failed to update all the files: [${filesToValidate.join(
198-
', ',
199-
)}] must have versions in them`,
200-
);
201-
echo(`These files already had version ${version.version} set.`);
202-
}
203-
204162
return;
205163
}
206164

0 commit comments

Comments
 (0)