From cf99d36c85ce28c469cd466bb50468a1bb85d571 Mon Sep 17 00:00:00 2001 From: Pavel Dvorkin Date: Thu, 6 Nov 2025 09:18:25 -0500 Subject: [PATCH] INFRA-3041:removed extra stable sync PR files --- .github/scripts/stable-sync.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/scripts/stable-sync.js b/.github/scripts/stable-sync.js index dd3fe2fe..8aa1f451 100644 --- a/.github/scripts/stable-sync.js +++ b/.github/scripts/stable-sync.js @@ -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 {