From ca0a1964949217e17afe9ecceb7cd1dfcae01c16 Mon Sep 17 00:00:00 2001
From: christianrowlands <christian.rowlands@gmail.com>
Date: Thu, 26 Oct 2023 14:14:20 -0400
Subject: [PATCH] Reenable the tests for the release

---
 .github/workflows/android-release.yaml | 70 +++++++++++++-------------
 .github/workflows/android.yaml         |  2 +-
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/android-release.yaml b/.github/workflows/android-release.yaml
index df52f57e..c3539897 100644
--- a/.github/workflows/android-release.yaml
+++ b/.github/workflows/android-release.yaml
@@ -9,35 +9,35 @@ on:
   workflow_dispatch:
 
 jobs:
-#  test:
-#    name: Run Tests
-#    runs-on: macos-latest
-#
-#    strategy:
-#      matrix:
-#        api-level: [ 26, 31 ]
-#        target: [ default, google_apis ]
-#
-#    steps:
-#      - name: Checkout the code
-#        uses: actions/checkout@v1
-#
-#      - name: Set up JDK 11
-#        uses: actions/setup-java@v2
-#        with:
-#          java-version: 11
-#          distribution: 'adopt'
-#
-#      - name: Cache dependencies
-#        uses: actions/cache@v2
-#        with:
-#          path: |
-#            ~/.gradle/caches
-#            ~/.gradle/wrapper
-#          key: ${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}-${{ hashFiles('**/buildSrc/**/*.kt') }}
-#
-#      - name: Unit Tests
-#        run: ./gradlew test --stacktrace
+  test:
+    name: Run Tests
+    runs-on: macos-latest
+
+    strategy:
+      matrix:
+        api-level: [ 26, 31 ]
+        target: [ default, google_apis ]
+
+    steps:
+      - name: Checkout the code
+        uses: actions/checkout@v1
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          java-version: 11
+          distribution: 'adopt'
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}-${{ hashFiles('**/buildSrc/**/*.kt') }}
+
+      - name: Unit Tests
+        run: ./gradlew test --stacktrace
 
       # Need to work through a permissions error to get these working
       #      - name: Instrumentation Tests
@@ -50,12 +50,12 @@ jobs:
       #          script: ./gradlew test check connectedCheck -x lint --stacktrace
 
       # Only upload the reports on failure
-#      - name: Upload Reports
-#        uses: actions/upload-artifact@v2
-#        with:
-#          name: Test-Reports
-#          path: networksurvey/build/reports
-#        if: failure()
+      - name: Upload Reports
+        uses: actions/upload-artifact@v2
+        with:
+          name: Test-Reports
+          path: networksurvey/build/reports
+        if: failure()
 
   bumpVersion:
 #    needs: test
diff --git a/.github/workflows/android.yaml b/.github/workflows/android.yaml
index cd17caf8..5640f853 100644
--- a/.github/workflows/android.yaml
+++ b/.github/workflows/android.yaml
@@ -52,7 +52,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: Network Survey CDR Debug APK
-          path: networksurvey/build/outputs/apk/cdr/debug/${{ env.base_name }}-cdr-no-tracking-debug.apk
+          path: networksurvey/build/outputs/apk/cdr/debug/${{ env.base_name }}-cdr-debug.apk
 
 
   test: