Merge pull request #8043 from nextcloud/MatrixFlavors

[Testing] Build flavors with matrix

.github/workflows/assembleFlavors.yml

@@ -0,0 +1,23 @@
+name: "Assemble"
+
+on:
+    pull_request:
+        branches: [ master, stable-* ]
+
+jobs:
+    flavor:
+        runs-on: macOS-latest
+        strategy:
+            fail-fast: false
+            matrix:
+                flavor: [ Generic, Gplay ]
+        steps:
+            -   uses: actions/checkout@v2
+            -   name: set up JDK 1.8
+                uses: actions/setup-java@v1
+                with:
+                    java-version: 1.8
+            -   name: Build ${{ matrix.flavor }}
+                run: |
+                    echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" >> gradle.properties
+                    ./gradlew assemble${{ matrix.flavor }}

.github/workflows/gPlayFlavor.yml

@@ -1,23 +0,0 @@
-name: "Gplay Flavor"
-
-on:
-    pull_request:
-        branches: [ master, stable-* ]
-
-jobs:
-    gPlayFlavor:
-        runs-on: ubuntu-latest
-        steps:
-            -   uses: actions/checkout@v2
-            -   name: set up JDK 1.8
-                uses: actions/setup-java@v1
-                with:
-                    java-version: 1.8
-            -   name: Install NDK
-                run: echo "y" | sudo /usr/local/lib/android/sdk/tools/bin/sdkmanager --install "ndk;21.0.6113669" --sdk_root=${ANDROID_SDK_ROOT}
-            -   name: Build with Gradle
-                run: |
-                    mkdir -p $HOME/.gradle
-                    echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > $HOME/.gradle/gradle.properties
-                    ./gradlew assembleGplay
-

.github/workflows/genericFlavor.yml

@@ -1,23 +0,0 @@
-name: "Generic Flavor"
-
-on:
-    pull_request:
-        branches: [ master, stable-* ]
-
-jobs:
-    genericFlavor:
-        runs-on: ubuntu-latest
-        steps:
-            -   uses: actions/checkout@v2
-            -   name: set up JDK 1.8
-                uses: actions/setup-java@v1
-                with:
-                    java-version: 1.8
-            -   name: Install NDK
-                run: echo "y" | sudo /usr/local/lib/android/sdk/tools/bin/sdkmanager --install "ndk;21.0.6113669" --sdk_root=${ANDROID_SDK_ROOT}
-            -   name: Build generic
-                run: |
-                    mkdir -p $HOME/.gradle
-                    echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > $HOME/.gradle/gradle.properties
-                    ./gradlew assembleGeneric
-