Merge pull request #636 from MikeOrtiz/FasterCI

Faster CI on Ubuntu
MikeOrtiz · Jan 17, 2025 · 0d7f0ae · 0d7f0ae
2 parents a7a730d + e39570d
commit 0d7f0ae
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 3 deletions.
diff --git a/.github/workflows/Android-CI.yml b/.github/workflows/Android-CI.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ macOS-13 ]
+        os: [ ubuntu-22.04 ]
         api: [ 28 ]
         tag: [ default ]
         abi: [ x86_64 ]
@@ -23,8 +23,17 @@ jobs:
         with:
           fetch-depth: 0
           submodules: true
+      - name: kvm support
+        run: |
+          egrep -c '(vmx|svm)' /proc/cpuinfo
+          id
+          sudo adduser $USER kvm
+          sudo chown -R $USER /dev/kvm
+          id
       - name: prepare
-        run: brew install exiftool imagemagick
+        run: |
+          sudo apt-get update && sudo apt-get install -y exiftool imagemagick xdg-utils libimage-exiftool-perl zsh jq xorg
+      #          brew install exiftool imagemagick
       - name: Install JDK ${{ matrix.java_version }}
         uses: actions/setup-java@v4
         with:
@@ -64,7 +73,9 @@ jobs:
       - name: Compare screenshots
         run: |
           ls -ls app/build/outputs/connected_android_test_additional_output/debugAndroidTest/connected
-          cp app/build/outputs/connected_android_test_additional_output/debugAndroidTest/connected/emulator\(AVD\)\ -\ 9/* screenshotsToCompare
+          cp app/build/outputs/connected_android_test_additional_output/debugAndroidTest/connected/emulator-5554\ -\ 9/* screenshotsToCompare
+          export DISPLAY=:99
+          sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
           ./screenShotCompare.sh
       - name: Archive screenshots diffs
         if: ${{ always() }}

diff --git a/screenshotsToCompare/MainSmokeTest_testAnimateZoom.png b/screenshotsToCompare/MainSmokeTest_testAnimateZoom.png
diff --git a/screenshotsToCompare/TouchTest_testSingleTouch-touch1.png b/screenshotsToCompare/TouchTest_testSingleTouch-touch1.png
diff --git a/screenshotsToCompare/TouchTest_testSingleTouch-touch2.png b/screenshotsToCompare/TouchTest_testSingleTouch-touch2.png
diff --git a/screenshotsToCompare/ZoomTest_zoom-1-init.png b/screenshotsToCompare/ZoomTest_zoom-1-init.png
diff --git a/screenshotsToCompare/ZoomTest_zoom-2-reset.png b/screenshotsToCompare/ZoomTest_zoom-2-reset.png
diff --git a/screenshotsToCompare/ZoomTest_zoom-3-zoom.png b/screenshotsToCompare/ZoomTest_zoom-3-zoom.png
diff --git a/screenshotsToCompare/ZoomTest_zoom-4-end.png b/screenshotsToCompare/ZoomTest_zoom-4-end.png