Skip to content

Commit efe14d0

Browse files
committed
Merge remote-tracking branch 'origin/master' into fix-fadeToColor--none
2 parents c09da74 + 9f967bd commit efe14d0

File tree

3 files changed

+1150
-1234
lines changed

3 files changed

+1150
-1234
lines changed

.github/workflows/android-detox.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ jobs:
3838

3939
steps:
4040
- name: Checkout
41-
uses: actions/checkout@v1
41+
uses: actions/checkout@v2
4242
with:
4343
fetch-depth: 1
4444

4545
- name: Node
46-
uses: actions/setup-node@v1
46+
uses: actions/setup-node@v2
4747

4848
- name: Use specific Java version for sdkmanager to work
49-
uses: joschi/setup-jdk@v1
49+
uses: joschi/setup-jdk@v2
5050
with:
5151
java-version: 'openjdk8'
5252
architecture: 'x64'
@@ -85,7 +85,7 @@ jobs:
8585
run: yarn start & yarn test:android-ci
8686

8787
- name: Upload artifacts
88-
uses: actions/upload-artifact@v1
88+
uses: actions/upload-artifact@v2
8989
if: failure()
9090
with:
9191
name: Failing tests

examples/detox/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"react-native": "0.59.9"
2424
},
2525
"devDependencies": {
26-
"detox": "^14.0.1",
26+
"detox": "17.14.9",
2727
"mocha": "^6.1.3"
2828
},
2929
"detox": {

0 commit comments

Comments
 (0)