Merge branch 'master' into users/bacecek/set_and_clear_debug_app

ashishb · Apr 7, 2024 · 90ae9c1 · 90ae9c1
2 parents 0fda43f + 93a4581
commit 90ae9c1
Show file tree

Hide file tree

Showing 18 changed files with 190 additions and 17 deletions.
diff --git a/.github/workflows/adbe-unittests-api16.yml b/.github/workflows/adbe-unittests-api16.yml
@@ -24,7 +24,7 @@ concurrency:
 
 jobs:
   testOnAndroidApi16:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     # This test is slower compared to the other tests
     timeout-minutes: 20
 
@@ -38,6 +38,13 @@ jobs:
       - name: checkout
         uses: actions/checkout@v4
 
+      # Ref: https://github.com/ReactiveCircus/android-emulator-runner?tab=readme-ov-file#running-hardware-accelerated-emulators-on-linux-runners
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
       - name: Gradle cache
         uses: gradle/gradle-build-action@v3
 

diff --git a/.github/workflows/adbe-unittests-api21.yml b/.github/workflows/adbe-unittests-api21.yml
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   test:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     timeout-minutes: 15
 
     strategy:
@@ -26,6 +26,13 @@ jobs:
       - name: checkout
         uses: actions/checkout@v4
 
+      # Ref: https://github.com/ReactiveCircus/android-emulator-runner?tab=readme-ov-file#running-hardware-accelerated-emulators-on-linux-runners
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
       - name: Gradle cache
         uses: gradle/gradle-build-action@v3
 

diff --git a/.github/workflows/adbe-unittests-api22.yml b/.github/workflows/adbe-unittests-api22.yml
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   testOnApi22:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     timeout-minutes: 15
 
     strategy:
@@ -26,6 +26,13 @@ jobs:
       - name: checkout
         uses: actions/checkout@v4
 
+      # Ref: https://github.com/ReactiveCircus/android-emulator-runner?tab=readme-ov-file#running-hardware-accelerated-emulators-on-linux-runners
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
       - name: Gradle cache
         uses: gradle/gradle-build-action@v3
 

diff --git a/.github/workflows/adbe-unittests-api23.yml b/.github/workflows/adbe-unittests-api23.yml
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   testOnAp23:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     timeout-minutes: 15
 
     strategy:
@@ -26,6 +26,13 @@ jobs:
       - name: checkout
         uses: actions/checkout@v4
 
+      # Ref: https://github.com/ReactiveCircus/android-emulator-runner?tab=readme-ov-file#running-hardware-accelerated-emulators-on-linux-runners
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
       - name: Gradle cache
         uses: gradle/gradle-build-action@v3
 

diff --git a/.github/workflows/adbe-unittests-api24.yml b/.github/workflows/adbe-unittests-api24.yml
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   testOnApi24:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     timeout-minutes: 15
 
     strategy:
@@ -29,6 +29,13 @@ jobs:
       - name: Gradle cache
         uses: gradle/gradle-build-action@v3
 
+      # Ref: https://github.com/ReactiveCircus/android-emulator-runner?tab=readme-ov-file#running-hardware-accelerated-emulators-on-linux-runners
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
       - name: AVD cache
         uses: actions/cache@v4
         id: avd-cache

diff --git a/.github/workflows/adbe-unittests-api25.yml b/.github/workflows/adbe-unittests-api25.yml
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   testOnApi25:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     timeout-minutes: 15
 
     strategy:
@@ -26,6 +26,13 @@ jobs:
       - name: checkout
         uses: actions/checkout@v4
 
+      # Ref: https://github.com/ReactiveCircus/android-emulator-runner?tab=readme-ov-file#running-hardware-accelerated-emulators-on-linux-runners
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
       - name: Gradle cache
         uses: gradle/gradle-build-action@v3
 

diff --git a/.github/workflows/adbe-unittests-api26.yml b/.github/workflows/adbe-unittests-api26.yml
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   testOnApi26:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     timeout-minutes: 15
 
     strategy:
@@ -26,6 +26,13 @@ jobs:
       - name: checkout
         uses: actions/checkout@v4
 
+      # Ref: https://github.com/ReactiveCircus/android-emulator-runner?tab=readme-ov-file#running-hardware-accelerated-emulators-on-linux-runners
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
       - name: Gradle cache
         uses: gradle/gradle-build-action@v3
 

diff --git a/.github/workflows/adbe-unittests-api27.yml b/.github/workflows/adbe-unittests-api27.yml
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   testOnApi27:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     timeout-minutes: 15
 
     strategy:
@@ -26,6 +26,13 @@ jobs:
       - name: checkout
         uses: actions/checkout@v4
 
+      # Ref: https://github.com/ReactiveCircus/android-emulator-runner?tab=readme-ov-file#running-hardware-accelerated-emulators-on-linux-runners
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
       - name: Gradle cache
         uses: gradle/gradle-build-action@v3
 

diff --git a/.github/workflows/adbe-unittests-api28.yml b/.github/workflows/adbe-unittests-api28.yml
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   testOnApi28:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     timeout-minutes: 15
 
     strategy:
@@ -26,6 +26,13 @@ jobs:
       - name: checkout
         uses: actions/checkout@v4
 
+      # Ref: https://github.com/ReactiveCircus/android-emulator-runner?tab=readme-ov-file#running-hardware-accelerated-emulators-on-linux-runners
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
       - name: Gradle cache
         uses: gradle/gradle-build-action@v3
 

diff --git a/.github/workflows/adbe-unittests-api29.yml b/.github/workflows/adbe-unittests-api29.yml
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   testOnApi29:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     timeout-minutes: 15
 
     strategy:
@@ -26,6 +26,13 @@ jobs:
       - name: checkout
         uses: actions/checkout@v4
 
+      # Ref: https://github.com/ReactiveCircus/android-emulator-runner?tab=readme-ov-file#running-hardware-accelerated-emulators-on-linux-runners
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
       - name: Gradle cache
         uses: gradle/gradle-build-action@v3
 

diff --git a/.github/workflows/adbe-unittests-api30.yml b/.github/workflows/adbe-unittests-api30.yml
@@ -15,7 +15,7 @@ concurrency:
 
 jobs:
   testOnApi30:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     timeout-minutes: 15
 
     strategy:
@@ -29,6 +29,13 @@ jobs:
       - name: checkout
         uses: actions/checkout@v4
 
+      # Ref: https://github.com/ReactiveCircus/android-emulator-runner?tab=readme-ov-file#running-hardware-accelerated-emulators-on-linux-runners
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
       - name: Gradle cache
         uses: gradle/gradle-build-action@v3
 

diff --git a/.github/workflows/adbe-unittests-api31.yml b/.github/workflows/adbe-unittests-api31.yml
@@ -15,7 +15,7 @@ concurrency:
 
 jobs:
   testOnApi31:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     timeout-minutes: 15
 
     strategy:
@@ -29,6 +29,13 @@ jobs:
       - name: checkout
         uses: actions/checkout@v4
 
+      # Ref: https://github.com/ReactiveCircus/android-emulator-runner?tab=readme-ov-file#running-hardware-accelerated-emulators-on-linux-runners
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
       - name: Gradle cache
         uses: gradle/gradle-build-action@v3
 

diff --git a/.github/workflows/adbe-unittests-api32.yml b/.github/workflows/adbe-unittests-api32.yml
@@ -15,7 +15,7 @@ concurrency:
 
 jobs:
   testOnApi32:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     timeout-minutes: 30
 
     strategy:
@@ -30,6 +30,13 @@ jobs:
       - name: checkout
         uses: actions/checkout@v4
 
+      # Ref: https://github.com/ReactiveCircus/android-emulator-runner?tab=readme-ov-file#running-hardware-accelerated-emulators-on-linux-runners
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
       - name: Gradle cache
         uses: gradle/gradle-build-action@v3
 

diff --git a/.github/workflows/adbe-unittests-api33.yml b/.github/workflows/adbe-unittests-api33.yml
@@ -16,7 +16,7 @@ concurrency:
 
 jobs:
   testOnApi33:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     # This test is slow
     timeout-minutes: 30
 
@@ -32,6 +32,13 @@ jobs:
       - name: checkout
         uses: actions/checkout@v4
 
+      # Ref: https://github.com/ReactiveCircus/android-emulator-runner?tab=readme-ov-file#running-hardware-accelerated-emulators-on-linux-runners
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
       - name: Gradle cache
         uses: gradle/gradle-build-action@v3
 

diff --git a/.github/workflows/adbe-unittests-api34.yml b/.github/workflows/adbe-unittests-api34.yml
@@ -0,0 +1,76 @@
+---
+name: AdbeUnitTests-Api34
+
+on:
+  schedule:
+    - cron: '0 0 * * 0'  # Sunday midnight UTC
+  pull_request:
+    branches: [master, main]
+    paths:
+      - '.github/workflows/adbe-unittests-api34.yml'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  testOnApi34:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+
+    strategy:
+      matrix:
+        api-level: [34]
+        # API 30+ emulators only have x86_64 system images.
+        arch: ["x86_64"]
+        # "default" is not available
+        target: ["google_apis"]
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+
+      # Ref: https://github.com/ReactiveCircus/android-emulator-runner?tab=readme-ov-file#running-hardware-accelerated-emulators-on-linux-runners
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: Gradle cache
+        uses: gradle/gradle-build-action@v3
+
+      - name: AVD cache
+        uses: actions/cache@v4
+        id: avd-cache
+        with:
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: avd-${{ matrix.api-level }} - ${{ matrix.arch }} - ${{ matrix.target }}
+
+      - 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 }}
+          arch: ${{ matrix.arch }}
+          target: ${{ matrix.target }}
+          force-avd-creation: false
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: false
+          script: echo "Generated AVD snapshot for caching."
+
+      - name: Run tests
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ matrix.api-level }}
+          arch: ${{ matrix.arch }}
+          target: ${{ matrix.target }}
+          force-avd-creation: false
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: true
+          script: |
+            python3 -m pip install --upgrade pip
+            python3 -m pip install --user -r requirements.txt
+            make test_python3