Skip to content

Commit

Permalink
Cherry pick a few commits for 0.62-stable (facebook#676)
Browse files Browse the repository at this point in the history
* cherry pick 63d3aff: Fix detox yarn error with Xcode 12 (facebook#670)

* cherry pick a2f4df1: Disable redboxing on release builds (facebook#671)

* cherry pick f33110a: Fix Android CI (facebook#674)

Co-authored-by: HeyImChris <48299693+HeyImChris@users.noreply.github.com>
  • Loading branch information
amgleitman and HeyImChris authored Dec 16, 2020
1 parent 47b639c commit 0f0cc5e
Show file tree
Hide file tree
Showing 7 changed files with 241 additions and 239 deletions.
5 changes: 3 additions & 2 deletions .ado/android-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,9 @@ jobs:
inputs:
script: NDK=ndk`cat ${ANDROID_SDK_ROOT}/ndk-bundle/source.properties 2>&1 | grep Pkg.Revision | awk '{ print $3}' | awk -F. '{ print $1 }'`; mono $(System.DefaultWorkingDirectory)/nuget-bin/nuget.exe pack $(System.DefaultWorkingDirectory)/ReactAndroid/ReactAndroid.nuspec -OutputDirectory $(System.DefaultWorkingDirectory) -Properties buildNumber=$(buildNumber)-$NDK;commitId=$(Build.SourceVersion)

- script: '[ -f $(System.DefaultWorkingDirectory)/*.nupkg ]'
displayName: Verify that NuGet was actually created
# Android CI doesn't create a nuget now, but this check is failing builds. Quickest fix to unblock builds is to disable the check... but we need to find the root cause and fix it and enable this again.
# - script: '[ -f $(System.DefaultWorkingDirectory)/*.nupkg ]'
# displayName: Verify that NuGet was actually created

- task: CmdLine@2
displayName: 'Npm pack'
Expand Down
9 changes: 0 additions & 9 deletions .ado/templates/prep-android-nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,3 @@ steps:
$lines = Get-Content package.json | Where {$_ -match '^\s*"version":.*'}
$npmVersion = $lines.Trim().Split()[1].Trim('",');
echo "##vso[task.setvariable variable=buildNumber]$npmVersion"
# Pretty yucky - but we dont want devmain to have to update versions _all_ over the place
- task: PowerShell@2
displayName: Change pom file to always use version 1000
inputs:
targetType: inline # filePath | inline
script: |
(Get-Content android\com\facebook\react\react-native\0.62.0\react-native-0.62.0.pom).replace('<version>0.62.0</version>', '<version>1000.0.0-master</version>') | Set-Content android\com\facebook\react\react-native\0.62.0\react-native-0.62.0.pom
Loading

0 comments on commit 0f0cc5e

Please sign in to comment.