From 403ddee0e20c18f70dfa503cae3300bc43bd41f3 Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Fri, 29 Sep 2023 12:16:13 +0200 Subject: [PATCH] Update test framework --- .github/workflows/main.yml | 5 +++-- .../java/universe/constellation/orion/viewer/RenderThread.kt | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ff3f68d0c..fbc54e28a 100644 --- 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] + api-level: [18, 25] + arch: [[x86, X86]] steps: - name: checkout uses: actions/checkout@v3 @@ -105,4 +106,4 @@ jobs: 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 \ No newline at end of file + script: ./gradlew connected${{ matrix.arch[1] }}DebugAndroidTest -Porion.CIBuild=true \ No newline at end of file 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 index 45338c633..810e058db 100644 --- 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()