Skip to content

Commit

Permalink
Revert "v0.63 sync from upstream (#613)"
Browse files Browse the repository at this point in the history
This reverts commit efc221b.
  • Loading branch information
alloy committed Sep 30, 2020
1 parent efc221b commit 530ff21
Show file tree
Hide file tree
Showing 1,386 changed files with 87,093 additions and 89,842 deletions.
6 changes: 5 additions & 1 deletion .ado/templates/apple-job-javascript.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ steps:

- template: apple-xcode-select.yml

- template: apple-droid-node-patching.yml
parameters:
apply_office_patches: $(apply_office_patches)

- script: 'yarn install'
displayName: 'yarn install'

Expand All @@ -38,4 +42,4 @@ steps:
displayName: 'yarn lint'

- script: 'yarn format-check'
displayName: 'yarn format-check'
displayName: 'yarn format-check'
6 changes: 5 additions & 1 deletion .ado/templates/apple-job-react-native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,13 @@ steps:
- script: brew link node@12 --overwrite --force
displayName: 'ensure node 12'

# Task Group: Xcode select proper version
# Task Group: XCode select proper version
- template: apple-xcode-select.yml

- template: apple-droid-node-patching.yml
parameters:
apply_office_patches: $(apply_office_patches)

- task: CmdLine@2
displayName: yarn install
inputs:
Expand Down
47 changes: 47 additions & 0 deletions .appveyor/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
environment:
ANDROID_HOME: "C:\\android-sdk-windows"
ANDROID_NDK: "C:\\android-sdk-windows\\android-ndk-r19c"
ANDROID_BUILD_VERSION: 28
ANDROID_TOOLS_VERSION: 28.0.3

GRADLE_OPTS: -Dorg.gradle.daemon=false

SDK_TOOLS_URL: https://dl.google.com/android/repository/sdk-tools-windows-3859397.zip
NDK_TOOLS_URL: https://dl.google.com/android/repository/android-ndk-r19c-windows-x86_64.zip

matrix:
- nodejs_version: 8
- nodejs_version: 10

install:
# Install Android SDK Tools
- mkdir "%ANDROID_HOME%"
- appveyor DownloadFile "%SDK_TOOLS_URL%" -FileName "%TMP%/sdk-tools.zip"
- 7z x "%TMP%/sdk-tools.zip" -o"%ANDROID_HOME%" > nul
- set PATH=%PATH%;"%ANDROID_HOME%\tools\bin"

- yes 2> nul | sdkmanager --licenses > nul
- yes 2> nul | sdkmanager "system-images;android-19;google_apis;armeabi-v7a"
- yes 2> nul | sdkmanager "platforms;android-%ANDROID_BUILD_VERSION%"
- yes 2> nul | sdkmanager "build-tools;%ANDROID_TOOLS_VERSION%"
- yes 2> nul | sdkmanager "add-ons;addon-google_apis-google-23"
- yes 2> nul | sdkmanager "extras;android;m2repository"

- appveyor DownloadFile "%NDK_TOOLS_URL%" -FileName "%TMP%/ndk.zip"
- 7z x "%TMP%/ndk.zip" -o"%ANDROID_HOME%" > nul

- ps: Install-Product node $env:nodejs_version x64
- npx envinfo@latest
- appveyor-retry yarn install

build_script:
- yarn run flow-check-android
- yarn run flow-check-ios
- yarn run test
# - gradlew.bat RNTester:android:app:assembleRelease

cache:
- node_modules
- "%LOCALAPPDATA%/Yarn"
- "%USERPROFILE%/.gradle/caches"
- "%USERPROFILE%/.gradle/wrapper"
2 changes: 1 addition & 1 deletion .buckconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

[android]
target = android-29
target = android-28

[download]
max_number_of_retries = 3
Expand Down
2 changes: 1 addition & 1 deletion .circleci/Dockerfiles/Dockerfile.android
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# and build a Android application that can be used to run the
# tests specified in the scripts/ directory.
#
FROM reactnativecommunity/react-native-android:2019-10-18
FROM reactnativecommunity/react-native-android:2019-9-4

LABEL Description="React Native Android Test Image"
LABEL maintainer="Héctor Ramos <hector@fb.com>"
Expand Down
Loading

0 comments on commit 530ff21

Please sign in to comment.