Commit fbf58af

authored

Merge branch 'next' into maze-runner-retry

2 parents 5e8da60 + e8adfd7 commit fbf58afCopy full SHA for fbf58af

File tree

2 files changed

+11

-11

lines changed

.buildkite
- expo-pipeline.yml
dockerfiles
- Dockerfile.expo-android-builder

2 files changed

+11

-11

lines changed

`‎.buildkite/expo-pipeline.yml‎`

Lines changed: 10 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ steps:`
`76`	`76`	`artifact_paths: build/output.ipa`
`77`	`77`	`commands:`
`78`	`78`	`- test/expo/scripts/build-ios.sh`
`79`		`-`
	`79`	`+`
`80`	`80`	`- wait`
`81`	`81`
`82`	`82`	`- label: 'expo Android 9'`
`@@ -90,9 +90,9 @@ steps:`
`90`	`90`	`env:`
`91`	`91`	`DEVICE_TYPE: "ANDROID_9"`
`92`	`92`	`APP_LOCATION: "build/output.apk"`
`93`		`- concurrency: 5`
	`93`	`+ concurrency: 10`
`94`	`94`	`concurrency_group: 'browserstack-app'`
`95`		`-`
	`95`	`+`
`96`	`96`	`- label: 'expo iOS 12'`
`97`	`97`	`timeout_in_minutes: 50`
`98`	`98`	`plugins:`
`@@ -104,7 +104,7 @@ steps:`
`104`	`104`	`env:`
`105`	`105`	`DEVICE_TYPE: "IOS_12"`
`106`	`106`	`APP_LOCATION: "build/output.ipa"`
`107`		`- concurrency: 5`
	`107`	`+ concurrency: 10`
`108`	`108`	`concurrency_group: 'browserstack-app'`
`109`	`109`
`110`	`110`	`- block: "Trigger full test suite"`
`@@ -120,7 +120,7 @@ steps:`
`120`	`120`	`env:`
`121`	`121`	`DEVICE_TYPE: "ANDROID_8"`
`122`	`122`	`APP_LOCATION: "build/output.apk"`
`123`		`- concurrency: 5`
	`123`	`+ concurrency: 10`
`124`	`124`	`concurrency_group: 'browserstack-app'`
`125`	`125`
`126`	`126`	`- label: 'expo Android 7'`
`@@ -134,7 +134,7 @@ steps:`
`134`	`134`	`env:`
`135`	`135`	`DEVICE_TYPE: "ANDROID_7"`
`136`	`136`	`APP_LOCATION: "build/output.apk"`
`137`		`- concurrency: 5`
	`137`	`+ concurrency: 10`
`138`	`138`	`concurrency_group: 'browserstack-app'`
`139`	`139`
`140`	`140`	`- label: 'expo Android 6'`
`@@ -148,7 +148,7 @@ steps:`
`148`	`148`	`env:`
`149`	`149`	`DEVICE_TYPE: "ANDROID_6"`
`150`	`150`	`APP_LOCATION: "build/output.apk"`
`151`		`- concurrency: 5`
	`151`	`+ concurrency: 10`
`152`	`152`	`concurrency_group: 'browserstack-app'`
`153`	`153`
`154`	`154`	`- label: 'expo Android 5'`
`@@ -162,7 +162,7 @@ steps:`
`162`	`162`	`env:`
`163`	`163`	`DEVICE_TYPE: "ANDROID_5"`
`164`	`164`	`APP_LOCATION: "build/output.apk"`
`165`		`- concurrency: 5`
	`165`	`+ concurrency: 10`
`166`	`166`	`concurrency_group: 'browserstack-app'`
`167`	`167`
`168`	`168`	`- label: 'expo iOS 10'`
`@@ -176,7 +176,7 @@ steps:`
`176`	`176`	`env:`
`177`	`177`	`DEVICE_TYPE: "IOS_10"`
`178`	`178`	`APP_LOCATION: "build/output.ipa"`
`179`		`- concurrency: 5`
	`179`	`+ concurrency: 10`
`180`	`180`	`concurrency_group: 'browserstack-app'`
`181`	`181`
`182`	`182`	`- label: 'expo iOS 11'`
`@@ -190,5 +190,5 @@ steps:`
`190`	`190`	`env:`
`191`	`191`	`DEVICE_TYPE: "IOS_11"`
`192`	`192`	`APP_LOCATION: "build/output.ipa"`
`193`		`- concurrency: 5`
	`193`	`+ concurrency: 10`
`194`	`194`	`concurrency_group: 'browserstack-app'`

`‎dockerfiles/Dockerfile.expo-android-builder‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ FROM openjdk:8-jdk-stretch`
`2`	`2`
`3`	`3`	`RUN apt-get update`
`4`	`4`
`5`		`-RUN curl -sL https://deb.nodesource.com/setup_8.x \| bash -`
	`5`	`+RUN curl -sL https://deb.nodesource.com/setup_12.x \| bash -`
`6`	`6`	`RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg \| apt-key add -`
`7`	`7`	`RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" \| tee /etc/apt/sources.list.d/yarn.list`
`8`	`8`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit fbf58af

File tree

2 files changed

2 files changed

`‎.buildkite/expo-pipeline.yml‎`

`‎dockerfiles/Dockerfile.expo-android-builder‎`

0 commit comments