Browse Source

Merge branch 'master' into ci/detox

Jamon Holmgren 5 years ago
parent
commit
57b7ac1822
3 changed files with 24 additions and 4 deletions
  1. 20
    0
      .github/workflows/detox.yml
  2. 3
    3
      android/build.gradle
  3. 1
    1
      package.json

+ 20
- 0
.github/workflows/detox.yml View File

1
+name: 'Detox CI Tests'
2
+on: [push]
3
+
4
+jobs:
5
+  tests:
6
+    name: 'Running tests'
7
+    runs-on: 'macOS-latest'
8
+    steps:
9
+      - uses: actions/checkout@master
10
+      - uses: actions/setup-node@master
11
+        with:
12
+          node-version: 12.6
13
+      - name: Setup - Install Yarn
14
+        run: YARN_GPG=NO curl -o- -L https://yarnpkg.com/install.sh | bash
15
+      - name: Setup - Install NPM Dependencies
16
+        run: yarn
17
+      - name: Setup - Install CocoaPods CLI
18
+        run: sudo gem install cocoapods
19
+      - name: Run tests
20
+        run: yarn ci

+ 3
- 3
android/build.gradle View File

72
       name androidSourcesName
72
       name androidSourcesName
73
     }
73
     }
74
 
74
 
75
-    logger.quiet(":${project.name}:reactNativeAndroidRoot ${defaultDir.canonicalPath}")
75
+    logger.info(":${project.name}:reactNativeAndroidRoot ${defaultDir.canonicalPath}")
76
     found = true
76
     found = true
77
   } else {
77
   } else {
78
     def parentDir = rootProject.projectDir
78
     def parentDir = rootProject.projectDir
97
           name androidSourcesName
97
           name androidSourcesName
98
         }
98
         }
99
 
99
 
100
-        logger.quiet(":${project.name}:reactNativeAndroidRoot ${androidPrebuiltBinaryDir.canonicalPath}")
100
+        logger.info(":${project.name}:reactNativeAndroidRoot ${androidPrebuiltBinaryDir.canonicalPath}")
101
         found = true
101
         found = true
102
       } else if (androidSourcesDir.exists()) {
102
       } else if (androidSourcesDir.exists()) {
103
         maven {
103
         maven {
105
           name androidSourcesName
105
           name androidSourcesName
106
         }
106
         }
107
 
107
 
108
-        logger.quiet(":${project.name}:reactNativeAndroidRoot ${androidSourcesDir.canonicalPath}")
108
+        logger.info(":${project.name}:reactNativeAndroidRoot ${androidSourcesDir.canonicalPath}")
109
         found = true
109
         found = true
110
       }
110
       }
111
     })
111
     })

+ 1
- 1
package.json View File

8
     "Thibault Malbranche <malbranche.thibault@gmail.com>"
8
     "Thibault Malbranche <malbranche.thibault@gmail.com>"
9
   ],
9
   ],
10
   "license": "MIT",
10
   "license": "MIT",
11
-  "version": "7.0.2",
11
+  "version": "7.0.3",
12
   "homepage": "https://github.com/react-native-community/react-native-webview#readme",
12
   "homepage": "https://github.com/react-native-community/react-native-webview#readme",
13
   "scripts": {
13
   "scripts": {
14
     "ci": "CI=true && yarn lint && yarn test && ./bin/detox",
14
     "ci": "CI=true && yarn lint && yarn test && ./bin/detox",