Skip to content

Fix xplat sync to ignore @generated header #29738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 3, 2024
Merged

Fix xplat sync to ignore @generated header #29738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b2ee74
Fix xplat sync to ignore @generated header
rickhanlonii Jun 3, 2024
20a94d7
update version string in rn
rickhanlonii Jun 3, 2024
b617aec
Add comment
rickhanlonii Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/commit_artifacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,9 @@ jobs:
git status
echo "===================="
echo "Checking for changes"
if git status --porcelain | grep -qv '/REVISION'; then
# Check if there are changes in the files other than REVISION or @generated headers
# We also filter out the file name lines with "---" and "+++".
if git diff -- . ':(exclude)*REVISION' | grep -vE "^(@@|diff|index|\-\-\-|\+\+\+|@generated SignedSource)" | grep "^[+-]" > /dev/null; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a comment above explaining what its looking for an example of generated header to be matched. Otherwise its going to be rough for the next person who has to adjust this.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

echo "Changes detected"
echo "should_commit=true" >> "$GITHUB_OUTPUT"
else
Expand Down
9 changes: 9 additions & 0 deletions scripts/rollup/build-all-release-channels.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,15 @@ function processStable(buildDir) {
);
}

if (fs.existsSync(buildDir + '/facebook-react-native')) {
const versionString =
ReactVersion + '-native-fb-' + sha + '-' + dateString;
updatePlaceholderReactVersionInCompiledArtifacts(
buildDir + '/facebook-react-native',
versionString
);
}

// Now do the semver ones
const semverVersionsMap = new Map();
for (const moduleName in stablePackages) {
Expand Down