Skip to content

[Draft] Merge to commit before monorepo change #1795

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

Closed
wants to merge 1 commit into from
Closed

[Draft] Merge to commit before monorepo change #1795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .ado/templates/apple-tools-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
steps:
- task: NodeTool@0
inputs:
versionSource: 'fromFile'
versionFilePath: '.node-version'
versionSource: 'spec'
versionSpec: '18.x'

- task: UseRubyVersion@0
inputs:
Expand Down
8 changes: 8 additions & 0 deletions .babelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"presets": [
"module:metro-react-native-babel-preset"
],
"plugins": [
"babel-plugin-transform-flow-enums"
]
}
14 changes: 4 additions & 10 deletions .circleci/Dockerfiles/Dockerfile.android
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
# Disabling this is okay because per (Github#774) this test, which is redundant to Azure Devops test,
# fails in the fork because of Microsoft's V8 upgrade to Android
#
#FROM reactnativecommunity/react-native-android:6.1
#FROM reactnativecommunity/react-native-android:7.0

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

ARG BUCK_BUILD
# set default environment variables
ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs=\"-Xmx512m -XX:+HeapDumpOnOutOfMemoryError\""
ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dfile.encoding=utf-8 -Dorg.gradle.jvmargs=\"-Xmx512m -XX:+HeapDumpOnOutOfMemoryError\""
ENV KOTLIN_HOME="third-party/kotlin"

ADD .buckconfig /app/.buckconfig
Expand All @@ -44,7 +44,7 @@ ADD React /app/React
ADD keystores /app/keystores
ADD packages/react-native-codegen /app/packages/react-native-codegen
ADD tools /app/tools
add scripts /app/scripts
ADD scripts /app/scripts

# add third party dependencies
ADD Folly /app/Folly
Expand All @@ -55,13 +55,7 @@ ADD jsc /app/jsc
# set workdir
WORKDIR /app

RUN scripts/download-kotlin-compiler-with-buck.sh

RUN buck fetch ReactAndroid/src/test/java/com/facebook/react/modules
RUN buck fetch ReactAndroid/src/main/java/com/facebook/react
RUN buck fetch ReactAndroid/src/main/java/com/facebook/react/shell
RUN buck fetch ReactAndroid/src/test/...
RUN buck fetch ReactAndroid/src/androidTest/...
RUN scripts/buck/buck_fetch.sh

RUN buck build ReactAndroid/src/main/java/com/facebook/react
RUN buck build ReactAndroid/src/main/java/com/facebook/react/shell
Expand Down
Loading