Merge pull request #3882 from openfoodfacts/off-cinematic-multiverse

with too many dimensions
openfoodfacts · Mar 10, 2021 · 67c9d39 · 67c9d39
2 parents 4594db1 + 7f46029
commit 67c9d39
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/android-feature.yml b/.github/workflows/android-feature.yml
@@ -22,7 +22,7 @@ jobs:
           java-version: 1.8
 
       - name: Screenshots android tests
-        run: bash ./gradlew compileOffScreenshotsAndroidTestSources --stacktrace --info -PtestBuildType=screenshots
+        run: bash ./gradlew compileOffPlaystoreScreenshotsAndroidTestSources --stacktrace --info -PtestBuildType=screenshots
 
       - name: Unit tests
-        run: bash ./gradlew testObfDebugUnitTest testOffDebugUnitTest testOpfDebugUnitTest testOpffDebugUnitTest --stacktrace
+        run: bash ./gradlew testObfPlaystoreDebugUnitTest testOffPlaystoreDebugUnitTest testOpfPlaystoreDebugUnitTest testOpffPlaystoreDebugUnitTest --stacktrace
diff --git a/.github/workflows/android-integration.yml b/.github/workflows/android-integration.yml
@@ -23,12 +23,12 @@ jobs:
       - name: Screenshots android tests
         uses: eskatos/gradle-command-action@v1
         with:
-          arguments: compileOffScreenshotsAndroidTestSources --stacktrace --info -PtestBuildType=screenshots
+          arguments: compileOffPlaystoreScreenshotsAndroidTestSources --stacktrace --info -PtestBuildType=screenshots
 
       - name: Unit tests
         uses: eskatos/gradle-command-action@v1
         with:
-          arguments: testObfDebugUnitTest testOffDebugUnitTest testOpfDebugUnitTest testOpffDebugUnitTest --stacktrace
+          arguments: testObfPlaystoreDebugUnitTest testOffPlaystoreDebugUnitTest testOpfPlaystoreDebugUnitTest testOpffPlaystoreDebugUnitTest --stacktrace
 
   apk:
     name: Generate APK

diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Unit tests
         uses: eskatos/gradle-command-action@v1
         with:
-          arguments: testObfDebugUnitTest --stacktrace
+          arguments: testObfPlaystoreDebugUnitTest --stacktrace
 
   testOff:
     name: OFF testing
@@ -38,7 +38,7 @@ jobs:
       - name: Unit tests
         uses: eskatos/gradle-command-action@v1
         with:
-          arguments: testOffDebugUnitTest --stacktrace
+          arguments: testOffPlaystoreDebugUnitTest --stacktrace
 
   testOpf:
     name: OPF testing
@@ -55,7 +55,7 @@ jobs:
       - name: Unit tests
         uses: eskatos/gradle-command-action@v1
         with:
-          arguments: testOpfDebugUnitTest --stacktrace
+          arguments: testOpfPlaystoreDebugUnitTest --stacktrace
 
   testOpff:
     name: OPFF testing
@@ -72,7 +72,7 @@ jobs:
       - name: Unit tests
         uses: eskatos/gradle-command-action@v1
         with:
-          arguments: testOpffDebugUnitTest --stacktrace
+          arguments: testOpffPlaystoreDebugUnitTest --stacktrace
 
   google-play-internal:
     needs:

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -12,11 +12,11 @@ desc "Build debug and test APK for screenshots"
     )
     build_android_app(
       task: 'assemble',
-      build_type: 'Debug'
+      build_type: 'DebugPlaystore'
     )
     build_android_app(
       task: 'assemble',
-      build_type: 'AndroidTest'
+      build_type: 'AndroidTestPlaystore'
     )
   end
 
@@ -53,7 +53,7 @@ lane :release do
     gradle(
         project_dir: './',
         task: 'clean bundle',
-        build_type: 'offRelease'
+        build_type: 'offReleasePlaystore'
     )
 
     #upload the bundle to internal track of play store