Update test framework

max-kammerer · Sep 29, 2023 · d5fcbfc · d5fcbfc
1 parent f8d6d64
commit d5fcbfc
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -62,7 +62,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        api-level: [16, 25]
+        arch: [[16, x86, X86], [21, x86, X86], [28, x86_64, X86_64]]
+#        , [arm64-v8a, Arm64]
     steps:
       - name: checkout
         uses: actions/checkout@v3
@@ -83,26 +84,30 @@ jobs:
           path: |
             ~/.android/avd/*
             ~/.android/adb*
-          key: avd-${{ matrix.api-level }}
+          key: avd-${{ matrix.arch[0] }}-${{ matrix.arch[1] }}
 
       - name: Prepare thirdparty
         run: bash ./gradlew -b thirdparty_build.gradle downloadAndPatchDjvu downloadAndMakeMupdf
 
-      - 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
-          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: 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.arch[0] }}
+#          arch: ${{ matrix.arch[1] }}
+#          force-avd-creation: false
+#          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+#          disable-animations: false
+#          sdcard-path-or-size: 900M
+#          script: echo "Generated AVD snapshot for caching."
 
       - name: run tests
         uses: reactivecircus/android-emulator-runner@v2
         with:
-          api-level: ${{ matrix.api-level }}
+          api-level: ${{ matrix.arch[0] }}
+          arch: ${{ matrix.arch[1] }}
           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: ./gradlew connectedX86DebugAndroidTest -Porion.CIBuild=true
+          sdcard-path-or-size: 900M
+          script: ./gradlew connected${{ matrix.arch[2] }}DebugAndroidTest -Porion.CIBuild=true
diff --git a/orion-viewer/src/main/java/universe/constellation/orion/viewer/RenderThread.kt b/orion-viewer/src/main/java/universe/constellation/orion/viewer/RenderThread.kt
@@ -171,7 +171,7 @@ open class RenderThread(private val activity: OrionViewerActivity, protected var
                 log("Sending Bitmap")
                 val mutex = CountDownLatch(1)
 
-                if (!executeInSeparateThread) {
+                if (false && !executeInSeparateThread) {
                     fullScene.onNewImage(bitmap, curPos, mutex)
                     activity.device!!.flushBitmap()
                     mutex.countDown()