From 4a006d27c5d87cdc271cf168499e4e8b1bf5230a Mon Sep 17 00:00:00 2001 From: Amine Date: Thu, 27 Mar 2025 20:41:52 +0100 Subject: [PATCH] ci: Instrumentation tests coverage in ci. --- .../{common_build.yml => on_called_build.yml} | 3 +- .gitea/workflows/on_merge_on_release.yml | 4 +- .gitea/workflows/on_pr.yml | 98 ++----------------- .gitea/workflows/on_push.yml | 4 +- .gitea/workflows/on_ready_to_test.yml | 93 ++++++++++++++++++ 5 files changed, 106 insertions(+), 96 deletions(-) rename .gitea/workflows/{common_build.yml => on_called_build.yml} (96%) create mode 100644 .gitea/workflows/on_ready_to_test.yml diff --git a/.gitea/workflows/common_build.yml b/.gitea/workflows/on_called_build.yml similarity index 96% rename from .gitea/workflows/common_build.yml rename to .gitea/workflows/on_called_build.yml index 2959684..5ae78c3 100644 --- a/.gitea/workflows/common_build.yml +++ b/.gitea/workflows/on_called_build.yml @@ -6,8 +6,7 @@ jobs: BuildAndTestAndCoverage: runs-on: ubuntu-latest steps: - - name: Check out repository code - uses: actions/checkout@v4 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: "Check android app changes" diff --git a/.gitea/workflows/on_merge_on_release.yml b/.gitea/workflows/on_merge_on_release.yml index 2ec912f..f97a6e3 100644 --- a/.gitea/workflows/on_merge_on_release.yml +++ b/.gitea/workflows/on_merge_on_release.yml @@ -1,4 +1,4 @@ -name: Create tag +name: Realease on: push: branches: @@ -7,7 +7,7 @@ on: jobs: build: - uses: ./.gitea/workflows/common_build.yml + uses: ./.gitea/workflows/on_called_build.yml createTagAndChangelog: runs-on: ubuntu-latest needs: build diff --git a/.gitea/workflows/on_pr.yml b/.gitea/workflows/on_pr.yml index 7935296..742eee5 100644 --- a/.gitea/workflows/on_pr.yml +++ b/.gitea/workflows/on_pr.yml @@ -1,11 +1,11 @@ -name: Check PR code +name: PR on: pull_request: branches: - master jobs: - Lint: + PR: runs-on: ubuntu-latest steps: - name: Check out repository code @@ -36,7 +36,7 @@ jobs: files: | androidApp/src/main/res/values/strings.xml - name: upload translation sources - if: steps.check-api-changes.outputs.any_modified == 'true' + if: steps.check-translations-changes.outputs.any_modified == 'true' uses: crowdin/github-action@v2 with: config: './.gitea/workflows/assets/crowdin.yml' @@ -49,10 +49,10 @@ jobs: CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }} CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }} - name: wait - if: steps.check-api-changes.outputs.any_modified == 'true' + if: steps.check-translations-changes.outputs.any_modified == 'true' run: sleep 10s - name: download translations - if: steps.check-api-changes.outputs.any_modified == 'true' + if: steps.check-translations-changes.outputs.any_modified == 'true' uses: crowdin/github-action@v2 with: config: './.gitea/workflows/assets/crowdin.yml' @@ -65,18 +65,18 @@ jobs: CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }} CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }} - name: Check for uncommitted changes - if: steps.check-api-changes.outputs.any_modified == 'true' + if: steps.check-translations-changes.outputs.any_modified == 'true' id: check-changes uses: mskri/check-uncommitted-changes-action@v1.0.1 - name: Commit Changes - if: steps.check-api-changes.outputs.any_modified == 'true' && steps.check-changes.outputs.changes != '' + if: steps.check-translations-changes.outputs.any_modified == 'true' && steps.check-changes.outputs.changes != '' run: | git config --global user.email aminecmi+giteadrone@pm.me git config --global user.name giteadrone git add ./androidApp/src/main/res/* git commit -m "translation: translation files" - name: Push changes - if: steps.check-api-changes.outputs.any_modified == 'true' && steps.check-changes.outputs.changes != '' + if: steps.check-translations-changes.outputs.any_modified == 'true' && steps.check-changes.outputs.changes != '' uses: appleboy/git-push-action@v1.0.0 with: author_name: giteadrone @@ -87,85 +87,3 @@ jobs: build: needs: Lint uses: ./.gitea/workflows/common_build.yml - RunIntegrationTests: - needs: Lint - runs-on: ubuntu-latest - steps: - - name: Check out repository code - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: "Check android app changes" - id: check-android-changes - uses: tj-actions/changed-files@v45 - with: - files: | - androidApp/src/** - shared/src/commonMain/** - shared/src/androidMain/** - shared/src/commonTest/** - - name: Fetch tags - if: steps.check-android-changes.outputs.any_modified == 'true' - run: git fetch --tags -p - - uses: actions/setup-java@v4 - if: steps.check-android-changes.outputs.any_modified == 'true' - with: - distribution: 'temurin' - java-version: '17' - - uses: gradle/actions/setup-gradle@v3 - if: steps.check-android-changes.outputs.any_modified == 'true' - - uses: android-actions/setup-android@v3 - if: steps.check-android-changes.outputs.any_modified == 'true' - - name: Configure gradle... - if: steps.check-android-changes.outputs.any_modified == 'true' - run: mkdir -p ~/.gradle && echo "ignoreGitVersion=true" >> ~/.gradle/gradle.properties - - uses: KengoTODA/actions-setup-docker-compose@v1 - if: steps.check-android-changes.outputs.any_modified == 'true' - with: - version: "2.23.3" - - name: run selfoss - if: steps.check-android-changes.outputs.any_modified == 'true' - run: | - docker compose -f .gitea/workflows/assets/docker-compose.yml up -d - - name: Change url until I find a better way to do it - if: steps.check-android-changes.outputs.any_modified == 'true' - run: | - sed -i "s/const DEFAULT_URL = \"http:\/\/10\.0\.2\.2\:8888\"/const DEFAULT_URL = \"http:\/\/172\.17\.0\.1\:8888\"/g" ./androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/CommonTests.kt - - name: Tests - if: steps.check-android-changes.outputs.any_modified == 'true' - uses: reactivecircus/android-emulator-runner@v2 - with: - api-level: 29 - profile: pixel_2 - script: | - ./gradlew androidApp:clearScreenshotsTask || true - ./gradlew androidApp:createScreenshotDirectory - adb logcat -G 16M - ./gradlew JacocoDebugCodeCoverage || (./gradlew androidApp:fetchScreenshots && adb logcat 'InputReader:S' 'chatty:S' 'audio_hw_generic:S' 'LogApiCalls:D' '*:I' -d > ./androidApp/build/reports/androidTests/connected/screenshots/logs.txt) - - uses: actions/upload-artifact@v3 - if: steps.check-android-changes.outputs.any_modified == 'true' - with: - name: screenshot-espresso - path: androidApp/build/reports/androidTests/connected/screenshots - retention-days: 2 - overwrite: true - include-hidden-files: true - - uses: actions/upload-artifact@v3 - if: steps.check-android-changes.outputs.any_modified == 'true' - with: - path: androidApp/build/reports/androidTests/connected/debug/flavors/githubConfig - retention-days: 1 - overwrite: true - include-hidden-files: true - - uses: actions/upload-artifact@v3 - if: steps.check-android-changes.outputs.any_modified == 'true' - with: - name: coverage-espresso - path: androidApp/build/reports/jacoco/JacocoDebugCodeCoverage - retention-days: 1 - overwrite: true - include-hidden-files: true - - name: Clean - if: steps.check-android-changes.outputs.any_modified == 'true' || failure() - run: | - docker compose -f .gitea/workflows/assets/docker-compose.yml stop diff --git a/.gitea/workflows/on_push.yml b/.gitea/workflows/on_push.yml index 101d35b..2bb0746 100644 --- a/.gitea/workflows/on_push.yml +++ b/.gitea/workflows/on_push.yml @@ -1,4 +1,4 @@ -name: Check master code +name: Master on: push: branches: @@ -6,4 +6,4 @@ on: jobs: build: - uses: ./.gitea/workflows/common_build.yml \ No newline at end of file + uses: ./.gitea/workflows/on_called_build.yml diff --git a/.gitea/workflows/on_ready_to_test.yml b/.gitea/workflows/on_ready_to_test.yml new file mode 100644 index 0000000..c8e3d27 --- /dev/null +++ b/.gitea/workflows/on_ready_to_test.yml @@ -0,0 +1,93 @@ +on: + workflow_run: + workflows: [ Master, PR ] + types: [ completed ] + +jobs: + integrationTests: + runs-on: ubuntu-latest + if: ${{ github.event.workflow_run.conclusion == 'success' }} + steps: + - name: Check out repository code + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: "Check android app changes" + id: check-android-changes + uses: tj-actions/changed-files@v45 + with: + files: | + androidApp/src/** + shared/src/commonMain/** + shared/src/androidMain/** + shared/src/commonTest/** + - name: Fetch tags + if: steps.check-android-changes.outputs.any_modified == 'true' + run: git fetch --tags -p + - uses: actions/setup-java@v4 + if: steps.check-android-changes.outputs.any_modified == 'true' + with: + distribution: 'temurin' + java-version: '17' + - uses: gradle/actions/setup-gradle@v3 + if: steps.check-android-changes.outputs.any_modified == 'true' + - uses: android-actions/setup-android@v3 + if: steps.check-android-changes.outputs.any_modified == 'true' + - name: Configure gradle... + if: steps.check-android-changes.outputs.any_modified == 'true' + run: mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true" >> ~/.gradle/gradle.properties + - name: Change url until I find a better way to do it + if: steps.check-android-changes.outputs.any_modified == 'true' + run: | + sed -i "s/const DEFAULT_URL = \"http:\/\/10\.0\.2\.2\:8888\"/const DEFAULT_URL = \"http:\/\/172\.17\.0\.1\:8888\"/g" ./androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/CommonTests.kt + - uses: KengoTODA/actions-setup-docker-compose@v1 + if: steps.check-android-changes.outputs.any_modified == 'true' + with: + version: "2.23.3" + - name: run selfoss + if: steps.check-android-changes.outputs.any_modified == 'true' + run: | + docker compose -f .gitea/workflows/assets/docker-compose.yml up -d + - name: Tests + if: steps.check-android-changes.outputs.any_modified == 'true' + uses: reactivecircus/android-emulator-runner@v2 + with: + api-level: 29 + profile: pixel_2 + script: | + ./gradlew androidApp:clearScreenshotsTask || true + ./gradlew androidApp:createScreenshotDirectory + adb logcat -G 16M + ./gradlew JacocoDebugCodeCoverage || (./gradlew androidApp:fetchScreenshots && adb logcat 'InputReader:S' 'chatty:S' 'audio_hw_generic:S' 'LogApiCalls:D' '*:I' -d > ./androidApp/build/reports/androidTests/connected/screenshots/logs.txt) + - uses: actions/upload-artifact@v3 + if: steps.check-android-changes.outputs.any_modified == 'true' + with: + name: screenshot-espresso + path: androidApp/build/reports/androidTests/connected/screenshots + retention-days: 2 + overwrite: true + include-hidden-files: true + - uses: actions/upload-artifact@v3 + if: steps.check-android-changes.outputs.any_modified == 'true' + with: + path: androidApp/build/reports/androidTests/connected/debug/flavors/githubConfig + retention-days: 1 + overwrite: true + include-hidden-files: true + - uses: actions/upload-artifact@v3 + if: steps.check-android-changes.outputs.any_modified == 'true' + with: + name: coverage-espresso + path: androidApp/build/reports/jacoco/JacocoDebugCodeCoverage + retention-days: 1 + overwrite: true + include-hidden-files: true + - name: Clean + if: steps.check-android-changes.outputs.any_modified == 'true' || failure() + run: | + docker compose -f .gitea/workflows/assets/docker-compose.yml stop + nothingToDo: + runs-on: ubuntu-latest + if: ${{ github.event.workflow_run.conclusion == 'failure' }} + steps: + - run: echo 'The triggering workflow failed'