Merge pull request #289 from microsoft/maharrim/ci_build

Change cmake version, split build and test steps
microsoft · Mar 5, 2020 · bd580be · bd580be
2 parents 7e158d7 + a6c3860
commit bd580be
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
@@ -26,16 +26,18 @@ jobs:
       run: |
         cd "$Env:GITHUB_WORKSPACE\lib\android_build"
         .\gradlew.bat assemble
+    - name: Java unit tests
+      run: |
+        cd "$Env:GITHUB_WORKSPACE\lib\android_build"
         .\gradlew.bat maesdk:test
     - name: Upload Reports
       if: failure()
       uses: actions/upload-artifact@v1
       with:
         name: reports
         path: lib\android_build\maesdk\build\reports
-
-#    - name: Upload Artifacts
-#      uses: actions/upload-artifact@v1
-#      with:
-#        name: maesdk
-#        path: lib\android_build\maesdk\build\outputs\aar
+    - name: Upload Artifacts
+      uses: actions/upload-artifact@v1
+      with:
+        name: maesdk
+        path: lib\android_build\maesdk\build\outputs\aar
diff --git a/lib/android_build/app/build.gradle b/lib/android_build/app/build.gradle
@@ -25,7 +25,7 @@ android {
     externalNativeBuild {
         cmake {
             path "src/main/cpp/CMakeLists.txt"
-            version "3.16.2"
+            version "3.16.4"
         }
     }
 }

diff --git a/lib/android_build/maesdk/build.gradle b/lib/android_build/maesdk/build.gradle
@@ -31,7 +31,7 @@ android {
     externalNativeBuild {
         cmake {
             path "src/main/cpp/CMakeLists.txt"
-            version "3.16.2"
+            version "3.16.4"
         }
     }
 }