File tree Expand file tree Collapse file tree 1 file changed +9
-8
lines changed Expand file tree Collapse file tree 1 file changed +9
-8
lines changed Original file line number Diff line number Diff line change @@ -86,17 +86,18 @@ async function runGitCommands() {
8686 if ( process . env . REPO === 'mobile' ) {
8787 console . log ( 'Executing mobile-specific commands...' ) ;
8888
89- await exec ( `git checkout origin/${ baseBranch } -- bitrise.yml` ) ;
90- console . log ( `Executed: git checkout origin/${ baseBranch } -- bitrise.yml` ) ;
89+ // Preserve these files from main to avoid showing them as changes in the PR
90+ await exec ( `git checkout origin/main -- bitrise.yml` ) ;
91+ console . log ( `Executed: git checkout origin/main -- bitrise.yml` ) ;
9192
92- await exec ( `git checkout origin/${ baseBranch } -- android/app/build.gradle` ) ;
93- console . log ( `Executed: git checkout origin/${ baseBranch } -- android/app/build.gradle` ) ;
93+ await exec ( `git checkout origin/main -- android/app/build.gradle` ) ;
94+ console . log ( `Executed: git checkout origin/main -- android/app/build.gradle` ) ;
9495
95- await exec ( `git checkout origin/${ baseBranch } -- ios/MetaMask.xcodeproj/project.pbxproj` ) ;
96- console . log ( `Executed: git checkout origin/${ baseBranch } -- ios/MetaMask.xcodeproj/project.pbxproj` ) ;
96+ await exec ( `git checkout origin/main -- ios/MetaMask.xcodeproj/project.pbxproj` ) ;
97+ console . log ( `Executed: git checkout origin/main -- ios/MetaMask.xcodeproj/project.pbxproj` ) ;
9798
98- await exec ( `git checkout origin/${ baseBranch } -- package.json` ) ;
99- console . log ( `Executed: git checkout origin/${ baseBranch } -- package.json` ) ;
99+ await exec ( `git checkout origin/main -- package.json` ) ;
100+ console . log ( `Executed: git checkout origin/main -- package.json` ) ;
100101 }
101102 // If REPO is not set or is 'extension', skip repo-specific commands
102103 else {
You can’t perform that action at this time.
0 commit comments