Skip to content

Commit e3506a2

Browse files
authored
Merge branch 'master' into fix/android-overlay-touch-passthrough
2 parents 55daf07 + 464e137 commit e3506a2

160 files changed

Lines changed: 3083 additions & 949 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.buildkite/jobs/pipeline.android_rn_77.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
- "nvm install"
77
- "./scripts/ci.android.sh"
88
key: "android_rn_77"
9-
timeout_in_minutes: 90
9+
timeout_in_minutes: 60
1010
artifact_paths: "/Users/builder/uibuilder/work/playground/artifacts/**/*"
1111
retry:
1212
automatic:

.buildkite/jobs/pipeline.android_rn_78.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
- "nvm install"
77
- "./scripts/ci.android.sh"
88
key: "android"
9-
timeout_in_minutes: 90
9+
timeout_in_minutes: 60
1010
artifact_paths: "/Users/builder/uibuilder/work/playground/artifacts/**/*"
1111
retry:
1212
automatic:

.buildkite/jobs/pipeline.android_rn_82.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

.buildkite/jobs/pipeline.android_rn_84.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
- "nvm install"
77
- "./scripts/ci.android.sh"
88
key: "android_rn_84"
9-
timeout_in_minutes: 90
9+
timeout_in_minutes: 60
1010
artifact_paths: "/Users/builder/uibuilder/work/playground/artifacts/**/*"
1111

1212

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
- label: ":android: Android (RN 0.83.2)"
1+
- label: ":android: Android (RN 0.85.2)"
22
env:
33
JAVA_HOME: /opt/openjdk/jdk-17.0.9.jdk/Contents/Home/
4-
REACT_NATIVE_VERSION: 0.83.2
4+
REACT_NATIVE_VERSION: 0.85.2
55
command:
66
- "nvm install"
77
- "./scripts/ci.android.sh"
8-
key: "android_rn_83"
9-
timeout_in_minutes: 90
8+
key: "android_rn_85"
9+
timeout_in_minutes: 60
1010
artifact_paths: "/Users/builder/uibuilder/work/playground/artifacts/**/*"
1111

12-
13-

.buildkite/jobs/pipeline.ios_rn_77.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
- "nvm install"
66
- "./scripts/ci.ios.sh"
77
key: "ios_rn_77"
8-
timeout_in_minutes: 90
8+
timeout_in_minutes: 60
99
artifact_paths: "/Users/builder/uibuilder/work/playground/artifacts/**/*"
1010
retry:
1111
automatic:

.buildkite/jobs/pipeline.ios_rn_78.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
- "nvm install"
66
- "./scripts/ci.ios.sh"
77
key: "ios"
8-
timeout_in_minutes: 90
8+
timeout_in_minutes: 60
99
artifact_paths: "/Users/builder/uibuilder/work/playground/artifacts/**/*"
1010
retry:
1111
automatic:

.buildkite/jobs/pipeline.ios_rn_82.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

.buildkite/jobs/pipeline.ios_rn_84.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
- "nvm install"
66
- "./scripts/ci.ios.sh"
77
key: "ios_rn_84"
8-
timeout_in_minutes: 90
8+
timeout_in_minutes: 60
99
artifact_paths: "/Users/builder/uibuilder/work/playground/artifacts/**/*"
1010

1111

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
- label: ":ios: iOS (RN 0.83.2)"
1+
- label: ":ios: iOS (RN 0.85.2)"
22
env:
3-
REACT_NATIVE_VERSION: 0.83.2
3+
REACT_NATIVE_VERSION: 0.85.2
44
command:
55
- "nvm install"
66
- "./scripts/ci.ios.sh"
7-
key: "ios_rn_83"
8-
timeout_in_minutes: 90
7+
key: "ios_rn_85"
8+
timeout_in_minutes: 60
99
artifact_paths: "/Users/builder/uibuilder/work/playground/artifacts/**/*"
1010

11-
12-

0 commit comments

Comments
 (0)