Skip to content
Merged
Changes from all commits
Commits
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
17 changes: 9 additions & 8 deletions .github/scripts/stable-sync.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,17 +86,18 @@ async function runGitCommands() {
if (process.env.REPO === 'mobile') {
console.log('Executing mobile-specific commands...');

await exec(`git checkout origin/${baseBranch} -- bitrise.yml`);
console.log(`Executed: git checkout origin/${baseBranch} -- bitrise.yml`);
// Preserve these files from main to avoid showing them as changes in the PR
await exec(`git checkout origin/main -- bitrise.yml`);
console.log(`Executed: git checkout origin/main -- bitrise.yml`);

await exec(`git checkout origin/${baseBranch} -- android/app/build.gradle`);
console.log(`Executed: git checkout origin/${baseBranch} -- android/app/build.gradle`);
await exec(`git checkout origin/main -- android/app/build.gradle`);
console.log(`Executed: git checkout origin/main -- android/app/build.gradle`);

await exec(`git checkout origin/${baseBranch} -- ios/MetaMask.xcodeproj/project.pbxproj`);
console.log(`Executed: git checkout origin/${baseBranch} -- ios/MetaMask.xcodeproj/project.pbxproj`);
await exec(`git checkout origin/main -- ios/MetaMask.xcodeproj/project.pbxproj`);
console.log(`Executed: git checkout origin/main -- ios/MetaMask.xcodeproj/project.pbxproj`);

await exec(`git checkout origin/${baseBranch} -- package.json`);
console.log(`Executed: git checkout origin/${baseBranch} -- package.json`);
await exec(`git checkout origin/main -- package.json`);
console.log(`Executed: git checkout origin/main -- package.json`);
}
// If REPO is not set or is 'extension', skip repo-specific commands
else {
Expand Down
Loading