From 2a30bc4852516e8735929f5eb0ae1df6d4d90fc2 Mon Sep 17 00:00:00 2001
From: Norbel AMBANUMBEN <aanorbel@gmail.com>
Date: Tue, 30 Apr 2024 14:38:09 +0100
Subject: [PATCH] chore: updated ci flow to include news media scan

---
 .github/workflows/validate.yml | 40 ++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index a16aa1846..c076c21be 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -15,8 +15,10 @@ jobs:
     strategy:
       matrix:
         version:
-          - "StableFullRelease"
-          - "StableFdroidRelease"
+          - "OoniStableFullRelease"
+          - "OoniStableFdroidRelease"
+          - "DwStableFullRelease"
+          - "DwStableFdroidRelease"
 
     steps:
       - name: Set up JDK 17
@@ -47,14 +49,14 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Run unit tests
-        run: ./gradlew testStableFullRelease
+        run: ./gradlew testOoniStableFullRelease
 
       - name: Uploads test reports
         uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: test-report
-          path: app/build/test-results/testStableFullDebugUnitTest
+          path: app/build/test-results/testOoniStableFullReleaseUnitTest
 
   instrumented-test:
     name: Run instrumented tests
@@ -85,14 +87,14 @@ jobs:
           profile: pixel_3_xl
           ram-size: 4096M
           disable-animations: true
-          script: ./gradlew connectedStableFullDebugAndroidTest
+          script: ./gradlew connectedOoniStableFullDebugAndroidTest
 
       - name: uploads test reports
         uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: emulator-test-reports
-          path: app/build/reports/androidTests/connected/debug/flavors/stableFull/
+          path: app/build/reports/androidTests/connected/debug/flavors/ooniStableFull/
 
   assemble-archive:
     name: Archive APKs
@@ -101,10 +103,13 @@ jobs:
     strategy:
       matrix:
         version:
-          - "StableFullDebug"
-          - "StableFdroidDebug"
-          - "DevFullDebug"
-          - "DevFullDebugAndroidTest"
+          - "OoniStableFullDebug"
+          - "OoniStableFdroidDebug"
+          - "OoniDevFullDebug"
+          - "OoniDevFullDebugAndroidTest"
+          - "DwStableFullDebug"
+          - "DwStableFdroidDebug"
+          - "DwDevFullDebug"
     needs: [ build ]
 
     steps:
@@ -148,10 +153,13 @@ jobs:
         with:
           name: ${{ matrix.version }}Apk
           path: |
-            app/build/outputs/apk/devFull/debug/app-dev-full-debug.apk
-            app/build/outputs/apk/androidTest/devFull/debug/app-dev-full-debug-androidTest.apk
-            app/build/outputs/apk/stableFull/debug/app-stable-full-debug.apk
-            app/build/outputs/apk/stableFdroid/debug/app-stable-fdroid-debug.apk
+            app/build/outputs/apk/ooniStableFull/debug/app-ooni-stable-full-debug.apk
+            app/build/outputs/apk/ooniStableFdroid/debug/app-ooni-stable-fdroid-debug.apk
+            app/build/outputs/apk/ooniDevFull/debug/app-ooni-dev-full-debug.apk
+            app/build/outputs/apk/androidTest/ooniDevFull/debug/app-ooni-dev-full-debug-androidTest.apk
+            app/build/outputs/apk/dwStableFull/debug/app-dw-stable-full-debug.apk
+            app/build/outputs/apk/dwStableFdroid/debug/app-dw-stable-fdroid-debug.apk
+            app/build/outputs/apk/dwDevFull/debug/app-dw-dev-full-debug.apk
 
   distribute:
     name: Upload artifact to Firebase App Distribution
@@ -165,7 +173,7 @@ jobs:
       - name: Download app APK
         uses: actions/download-artifact@v4
         with:
-          name: DevFullDebugApk
+          name: OoniDevFullDebugApk
 
       - name: Upload artifact to Firebase App Distribution
         uses: wzieba/Firebase-Distribution-Github-Action@v1.7.0
@@ -174,7 +182,7 @@ jobs:
           appId: ${{secrets.FIREBASE_APP_ID}}
           serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }}
           groups: testers
-          file: devFull/debug/app-dev-full-debug.apk
+          file: ooniDevFull/debug/app-ooni-dev-full-debug.apk
       - name: Write Summary
         run: |
           echo "View this release in the Firebase console: ${{ steps.uploadArtifact.outputs.FIREBASE_CONSOLE_URI }}" >> $GITHUB_STEP_SUMMARY
\ No newline at end of file