From 5ebf3726ed62c4a0378014514757dc0b6133f042 Mon Sep 17 00:00:00 2001
From: XiangRongLin <41164160+XiangRongLin@users.noreply.github.com>
Date: Wed, 23 Jun 2021 20:14:27 +0200
Subject: [PATCH 1/2] Comment out test-android CI job

---
 .github/workflows/ci.yml | 51 +++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 676e46333..5c78a0e08 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,32 +43,35 @@ jobs:
         with:
           name: app
           path: app/build/outputs/apk/debug/*.apk
-  test-android:
-    runs-on: macos-latest
-    strategy:
-      matrix:
-        api-level: [21, 29]
-    steps:
-      - uses: actions/checkout@v2
 
-      - name: set up JDK 8
-        uses: actions/setup-java@v2
-        with:
-          java-version: 8
-          distribution: "adopt"
+# Disabled until emulator works again. see https://github.com/TeamNewPipe/NewPipe/pull/6560
+#  test-android:
+#    runs-on: macos-latest
+#    strategy:
+#      matrix:
+#        api-level: [21, 29]
+#    steps:
+#      - uses: actions/checkout@v2
+#
+#      - name: set up JDK 8
+#        uses: actions/setup-java@v2
+#        with:
+#          java-version: 8
+#          distribution: "adopt"
+#
+#      - name: Cache Gradle dependencies
+#        uses: actions/cache@v2
+#        with:
+#          path: ~/.gradle/caches
+#          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+#          restore-keys: ${{ runner.os }}-gradle
+#
+#      - name: Run android tests
+#        uses: reactivecircus/android-emulator-runner@v2
+#        with:
+#          api-level: ${{ matrix.api-level }}
+#          script: ./gradlew connectedCheck
 
-      - name: Cache Gradle dependencies
-        uses: actions/cache@v2
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: ${{ runner.os }}-gradle
-
-      - name: Run android tests
-        uses: reactivecircus/android-emulator-runner@v2
-        with:
-          api-level: ${{ matrix.api-level }}
-          script: ./gradlew connectedCheck
 #   sonar:
 #     runs-on: ubuntu-latest
 #     steps:

From b996fa7eef1f6c275328646c2bf5f566e8258903 Mon Sep 17 00:00:00 2001
From: XiangRongLin <41164160+XiangRongLin@users.noreply.github.com>
Date: Wed, 23 Jun 2021 20:16:23 +0200
Subject: [PATCH 2/2] Add comments explaining decisions in test-android ci job

---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5c78a0e08..8065d5e6a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,9 +46,11 @@ jobs:
 
 # Disabled until emulator works again. see https://github.com/TeamNewPipe/NewPipe/pull/6560
 #  test-android:
+     # macos has hardware acceleration. See android-emulator-runner action
 #    runs-on: macos-latest
 #    strategy:
 #      matrix:
+          # api-level 19 is min sdk, but throws errors related to desugaring
 #        api-level: [21, 29]
 #    steps:
 #      - uses: actions/checkout@v2