Updated build files

ooni · Nov 18, 2023 · 924402f · 924402f
1 parent 0660a6e
commit 924402f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/archive.yml b/.github/workflows/archive.yml
@@ -11,7 +11,7 @@ jobs:
           distribution: 'temurin'
       - name: checkout
         uses: actions/checkout@v2
-      - run: ./gradlew clean assembleDevFullRelease
+      - run: ./gradlew clean assembleOoniDevFullRelease
       - name: uploads dev apk
         uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,8 +7,8 @@ jobs:
     strategy:
       matrix:
         version:
-            - "StableFullRelease"
-            - "StableFdroidRelease"
+            - "OoniStableFullRelease"
+            - "OoniStableFdroidRelease"
     steps:
     - uses: actions/setup-java@v2
       with:

diff --git a/.github/workflows/emulator.yml b/.github/workflows/emulator.yml
@@ -29,7 +29,7 @@ jobs:
         arch: x86_64
         profile: Nexus 6
         ram-size: 2048M
-        script: ./gradlew connectedStableFullDebugAndroidTest
+        script: ./gradlew connectedOoniStableFullDebugAndroidTest
     - name: uploads test results
       uses: actions/upload-artifact@v2
       if: failure()

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,7 +11,7 @@ jobs:
           distribution: 'temurin'
       - name: checkout
         uses: actions/checkout@v2
-      - run: ./gradlew testStableFullRelease
+      - run: ./gradlew testOoniStableFullRelease
       - name: uploads test results
         uses: actions/upload-artifact@v2
         if: failure()

diff --git a/shared-test/build.gradle b/shared-test/build.gradle
@@ -18,8 +18,14 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_17
     }
-    flavorDimensions = ['testing', 'license']
+    flavorDimensions = ['provider', 'testing', 'license']
     productFlavors {
+        ooni {
+            dimension 'provider'
+        }
+        dw {
+            dimension 'provider'
+        }
         stable {
             dimension 'testing'
         }
@@ -36,9 +42,6 @@ android {
         full {
             dimension 'license'
         }
-        dw {
-            dimension 'testing'
-        }
     }
 }