Skip to content

Commit

Permalink
GA: refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
max-kammerer committed Apr 22, 2024
1 parent 80703f9 commit 0f2be0a
Show file tree
Hide file tree
Showing 3 changed files with 97 additions and 152 deletions.
41 changes: 41 additions & 0 deletions .github/workflows/config/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: "config"

runs:
using: "composite"
steps:
- uses: gradle/wrapper-validation-action@v2

- name: set up JDK 17
uses: actions/setup-java@v4
with:
java-version: 17
distribution: corretto

- name: Setup Gradle Cache
uses: gradle/gradle-build-action@v3

- name: Enable KVM group perms
if: ${{ runner.os == 'Linux' }}
shell: bash
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: Restore Native Libs
id: restore-nativeLibs
uses: actions/cache@v4
with:
path: |
nativeLibs/djvu
nativeLibs/mupdf
nativeLibs/mupdfModule/build
nativeLibs/mupdfModule/.cxx
nativeLibs/djvuModule/build
nativeLibs/djvuModule/.cxx
key: ${{ runner.os }}-native-libs-${{ hashFiles('thirdparty_build.gradle') }}

- name: Prepare thirdparty
shell: bash
run: bash ./gradlew -b thirdparty_build.gradle downloadAndPatchDjvu downloadAndMakeMupdf
if: steps.restore-nativeLibs.outputs.cache-hit != 'true'
166 changes: 14 additions & 152 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,33 +17,7 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: gradle/wrapper-validation-action@v2

- name: set up JDK 17
uses: actions/setup-java@v4
with:
java-version: 17
distribution: corretto

- name: Setup Gradle Cache
uses: gradle/gradle-build-action@v3

- name: Restore Native Libs
id: restore-nativeLibs
uses: actions/cache@v4
with:
path: |
nativeLibs/djvu
nativeLibs/mupdf
nativeLibs/mupdfModule/build
nativeLibs/mupdfModule/.cxx
nativeLibs/djvuModule/build
nativeLibs/djvuModule/.cxx
key: ${{ runner.os }}-native-libs-${{ hashFiles('thirdparty_build.gradle') }}

- name: Prepare thirdparty
run: bash ./gradlew -b thirdparty_build.gradle downloadAndPatchDjvu downloadAndMakeMupdf
if: steps.restore-nativeLibs.outputs.cache-hit != 'true'
- uses: ./.github/workflows/config

- name: Build debug APK
run: bash ./gradlew assembleDebug --stacktrace -Porion.CIBuild=true
Expand Down Expand Up @@ -85,75 +59,17 @@ jobs:
EMULATOR_API: ${{ matrix.arch[0] }}
runs-on: ${{ matrix.arch[2] }}
steps:
- name: checkout
uses: actions/checkout@v4

- name: Enable KVM group perms
if: ${{ matrix.arch[2] == 'ubuntu-latest' }}
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: set up JDK 17
uses: actions/setup-java@v4
with:
java-version: 17
distribution: corretto

- name: Setup Gradle Cache
uses: gradle/gradle-build-action@v3

- name: Restore Native Libs
id: restore-nativeLibs
uses: actions/cache@v4
with:
path: |
nativeLibs/djvu
nativeLibs/mupdf
nativeLibs/mupdfModule/build
nativeLibs/mupdfModule/.cxx
nativeLibs/djvuModule/build
nativeLibs/djvuModule/.cxx
key: ${{ runner.os }}-native-libs-${{ hashFiles('thirdparty_build.gradle') }}

- name: Prepare thirdparty
run: bash ./gradlew -b thirdparty_build.gradle downloadAndPatchDjvu downloadAndMakeMupdf
if: steps.restore-nativeLibs.outputs.cache-hit != 'true'
- uses: actions/checkout@v4
- name: Run job configurations
uses: ./.github/workflows/config

- name: run tests
uses: reactivecircus/android-emulator-runner@v2
- name: Run test and upload results
uses: ./.github/workflows/test
with:
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
sdcard-path-or-size: 900M
script: ./gradlew forwardLogcat connectedDebugAndroidTest -Porion.CIBuild=true

- uses: dorny/test-reporter@v1
with:
name: Test results ${{ matrix.arch[0] }}
path: orion-viewer/build/outputs/androidTest-results/connected/debug/TEST-*.xml
reporter: java-junit
if: failure()

- name: Upload screenshots and logcat
uses: actions/upload-artifact@v4
with:
name: screenshotsAndLogcat${{ matrix.arch[0] }}
path: orion-viewer/build/failures/
if-no-files-found: ignore
if: failure()

- name: Test Summary
uses: test-summary/action@v2
with:
paths: orion-viewer/build/outputs/androidTest-results/connected/debug/TEST-*.xml
if: always()

test_old:
test_Android_4_0:
strategy:
matrix:
arch: [[15, x86, ubuntu-latest]]
Expand All @@ -162,70 +78,16 @@ jobs:
EMULATOR_API: ${{ matrix.arch[0] }}
runs-on: ${{ matrix.arch[2] }}
steps:
- name: checkout
uses: actions/checkout@v4
- uses: actions/checkout@v4

- name: Run job configurations
uses: ./.github/workflows/config

- name: install libncurses5
run: sudo apt-get install -y libncurses5

- name: Enable KVM group perms
if: ${{ matrix.arch[2] == 'ubuntu-latest' }}
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: set up JDK 17
uses: actions/setup-java@v4
with:
java-version: 17
distribution: corretto

- name: Restore Native Libs
id: restore-nativeLibs
uses: actions/cache/restore@v4
with:
path: |
nativeLibs/djvu
nativeLibs/mupdf
nativeLibs/mupdfModule/build
nativeLibs/mupdfModule/.cxx
nativeLibs/djvuModule/build
nativeLibs/djvuModule/.cxx
key: ${{ runner.os }}-native-libs-${{ hashFiles('thirdparty_build.gradle') }}

- name: Prepare thirdparty
run: bash ./gradlew -b thirdparty_build.gradle downloadAndPatchDjvu downloadAndMakeMupdf
if: steps.restore-nativeLibs.outputs.cache-hit != 'true'

- name: run tests
uses: reactivecircus/android-emulator-runner@v2
- name: Run test and upload results
uses: ./.github/workflows/test
with:
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
sdcard-path-or-size: 900M
script: ./gradlew forwardLogcat connectedDebugAndroidTest -Porion.CIBuild=true -Porion.build.android40=true

- uses: dorny/test-reporter@v1
with:
name: Test results ${{ matrix.arch[0] }}
path: orion-viewer/build/outputs/androidTest-results/connected/debug/TEST-*.xml
reporter: java-junit
if: failure()

- name: Upload screenshots and logcat
uses: actions/upload-artifact@v4
with:
name: screenshotsAndLogcat${{ matrix.arch[0] }}
path: orion-viewer/build/failures/
if-no-files-found: ignore
if: failure()

- name: Test Summary
uses: test-summary/action@v2
with:
paths: orion-viewer/build/outputs/androidTest-results/connected/debug/TEST-*.xml
if: always()
arch: ${{ matrix.arch[1] }}
42 changes: 42 additions & 0 deletions .github/workflows/test/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: "test"

inputs:
api-level:
required: true
arch:
required: true

runs:
using: "composite"
steps:
- name: Run tests
uses: reactivecircus/android-emulator-runner@v2
with:
api-level: ${{ inputs.api-level }}
arch: ${{ inputs.arch }}
force-avd-creation: false
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
disable-animations: true
sdcard-path-or-size: 900M
script: ./gradlew forwardLogcat connectedDebugAndroidTest -Porion.CIBuild=true

- uses: dorny/test-reporter@v1
with:
name: Test results ${{ inputs.api-level }}
path: orion-viewer/build/outputs/androidTest-results/connected/debug/TEST-*.xml
reporter: java-junit
if: failure()

- name: Upload screenshots and logcat
uses: actions/upload-artifact@v4
with:
name: screenshotsAndLogcat${{ inputs.api-level }}
path: orion-viewer/build/failures/
if-no-files-found: ignore
if: failure()

- name: Test Summary
uses: test-summary/action@v2
with:
paths: orion-viewer/build/outputs/androidTest-results/connected/debug/TEST-*.xml
if: always()

0 comments on commit 0f2be0a

Please sign in to comment.