Merge pull request nextcloud#9043 from nextcloud/updateScreenshotsTests

Update screenshots tests

.github/workflows/command-rebase.yml

@@ -6,41 +6,41 @@
 name: Rebase command
 
 on:
-  issue_comment:
-    types: created
+    issue_comment:
+        types: created
 
 jobs:
-  rebase:
-    runs-on: ubuntu-latest
-
-    # On pull requests and if the comment starts with `/rebase`
-    if: github.event.issue.pull_request != '' && startsWith(github.event.comment.body, '/rebase')
-
-    steps:
-      - name: Add reaction on start
-        uses: peter-evans/create-or-update-comment@v1
-        with:
-          token: ${{ secrets.COMMAND_BOT_PAT }}
-          repository: ${{ github.event.repository.full_name }}
-          comment-id: ${{ github.event.comment.id }}
-          reaction-type: "+1"
-
-      - name: Checkout the latest code
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.COMMAND_BOT_PAT }}
-
-      - name: Automatic Rebase
-        uses: cirrus-actions/[email protected]
-        env:
-          GITHUB_TOKEN: ${{ secrets.COMMAND_BOT_PAT }}
-
-      - name: Add reaction on failure
-        uses: peter-evans/create-or-update-comment@v1
-        if: failure()
-        with:
-          token: ${{ secrets.COMMAND_BOT_PAT }}
-          repository: ${{ github.event.repository.full_name }}
-          comment-id: ${{ github.event.comment.id }}
-          reaction-type: "-1"
+    rebase:
+        runs-on: ubuntu-latest
+
+        # On pull requests and if the comment starts with `/rebase`
+        if: github.event.issue.pull_request != '' && startsWith(github.event.comment.body, '/rebase')
+
+        steps:
+            -   name: Add reaction on start
+                uses: peter-evans/create-or-update-comment@v1
+                with:
+                    token: ${{ secrets.COMMAND_BOT_PAT }}
+                    repository: ${{ github.event.repository.full_name }}
+                    comment-id: ${{ github.event.comment.id }}
+                    reaction-type: "+1"
+
+            -   name: Checkout the latest code
+                uses: actions/checkout@v2
+                with:
+                    fetch-depth: 0
+                    token: ${{ secrets.COMMAND_BOT_PAT }}
+
+            -   name: Automatic Rebase
+                uses: cirrus-actions/[email protected]
+                env:
+                    GITHUB_TOKEN: ${{ secrets.COMMAND_BOT_PAT }}
+
+            -   name: Add reaction on failure
+                uses: peter-evans/create-or-update-comment@v1
+                if: failure()
+                with:
+                    token: ${{ secrets.COMMAND_BOT_PAT }}
+                    repository: ${{ github.event.repository.full_name }}
+                    comment-id: ${{ github.event.comment.id }}
+                    reaction-type: "-1"

.github/workflows/screenShotTest.yml

@@ -12,25 +12,64 @@ jobs:
             matrix:
                 scheme: [ Light ]
                 color: [ blue ]
+                api-level: [ 27 ]
         steps:
             -   uses: actions/checkout@v2
-            -   name: set up JDK 11
-                uses: actions/setup-java@v2
+
+            -   name: Gradle cache
+                uses: actions/cache@v2
+                with:
+                    path: |
+                        ~/.gradle/caches
+                        ~/.gradle/wrapper
+                    key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
+            -   name: AVD cache
+                uses: actions/cache@v2
+                id: avd-cache
+                with:
+                    path: |
+                        ~/.android/avd/*
+                        ~/.android/adb*
+                    key: avd-${{ matrix.api-level }}
+
+            -   uses: actions/setup-java@v2
                 with:
                     distribution: "adopt"
                     java-version: 11
-            -   name: Build gplay
+
+            -   name: create AVD and generate snapshot for caching
+                if: steps.avd-cache.outputs.cache-hit != 'true'
+                uses: reactivecircus/android-emulator-runner@v2
+                with:
+                    api-level: ${{ matrix.api-level }}
+                    force-avd-creation: false
+                    arch: x86
+                    sdcard-path-or-size: 100M
+                    target: google_apis
+                    emulator-options: -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim -skin 500x833
+                    script: echo "Generated AVD snapshot for caching."
+
+            -   name: Configure gradle daemon
                 run: |
                     mkdir -p $HOME/.gradle
                     echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > $HOME/.gradle/gradle.properties
-                    ./gradlew assembleGplayDebug
+                    echo "org.gradle.caching=true" >> $HOME/.gradle/gradle.properties
+
+            -   name: Build gplay
+                run: ./gradlew assembleGplayDebug
+
             -   name: Delete old comments
                 if: ${{ always() }}
                 run: scripts/deleteOldComments.sh "${{ matrix.color }}-${{ matrix.scheme }}" "Screenshot" ${{github.event.number}} ${{ secrets.GITHUB_TOKEN }}
-            -   name: run tests
+
+            -   name: Run screenshot tests
                 uses: reactivecircus/android-emulator-runner@v2
                 with:
-                    api-level: 27
+                    api-level: ${{ matrix.api-level }}
+                    force-avd-creation: false
+                    arch: x86
+                    sdcard-path-or-size: 100M
+                    target: google_apis
                     emulator-options: -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim -skin 500x833
                     script: ./gradlew gplayDebugExecuteScreenshotTests -Pandroid.testInstrumentationRunnerArguments.annotation=com.owncloud.android.utils.ScreenshotTest -Pandroid.testInstrumentationRunnerArguments.COLOR=${{ matrix.color }} -Pandroid.testInstrumentationRunnerArguments.DARKMODE=${{ matrix.scheme }}
             -   name: upload failing results

build.gradle

@@ -456,6 +456,9 @@ detekt {
 
 shot {
     showOnlyFailingTestsInReports = ciBuild
+    // CI environment renders some shadows slightly different from local VMs
+    // Add a 0.5% tolerance to account for that
+    tolerance = ciBuild ? 0.5: 0
 }
 
 jacoco {