Skip to content

Cherry pick a few commits for 0.62-stable #676

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
harrieshin merged 3 commits into from
Dec 16, 2020
Merged

Cherry pick a few commits for 0.62-stable #676

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
c9aec9f
cherry pick 63d3aff: Fix detox yarn error with Xcode 12 (#670)
amgleitman Dec 14, 2020
f52960a
cherry pick a2f4df1: Disable redboxing on release builds (#671)
HeyImChris Dec 11, 2020
9d47e0a
cherry pick f33110a: Fix Android CI (#674)
HeyImChris Dec 12, 2020
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
5 changes: 3 additions & 2 deletions .ado/android-pr.yml
View file
Open in desktop
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
View file
Open in desktop
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