msb-public
/
nowinandroid
mirror of https://github.com/android/nowinandroid.git
1
0
Code Issues Projects Releases Wiki Activity

Logs

Browse Source
ben/dropshots
Ben Trengrove 6 months ago
parent 0ef9409fe0
commit 31e0d0a92e
2 changed files with 243 additions and 235 deletions
Show Stats Download Patch File Download Diff File

474
.github/workflows/Build.yaml vendored
Unescape View File

@ -11,250 +11,251 @@ concurrency:
cancel-in-progress: true cancel-in-progress: true
jobs: jobs:
test_and_apk: # test_and_apk:
name: "Local tests and APKs" # name: "Local tests and APKs"
runs-on: ubuntu-latest # runs-on: ubuntu-latest
permissions: # permissions:
contents: write # contents: write
pull-requests: write # pull-requests: write
timeout-minutes: 60 # timeout-minutes: 60
steps: # steps:
- name: Checkout # - name: Checkout
uses: actions/checkout@v4 # uses: actions/checkout@v4
- name: Validate Gradle Wrapper # - name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v3 # uses: gradle/wrapper-validation-action@v3
- name: Copy CI gradle.properties # - name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties # run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
- name: Set up JDK 17 # - name: Set up JDK 17
uses: actions/setup-java@v4 # uses: actions/setup-java@v4
with: # with:
distribution: 'zulu' # distribution: 'zulu'
java-version: 17 # java-version: 17
- name: Setup Gradle # - name: Setup Gradle
uses: gradle/gradle-build-action@v3 # uses: gradle/gradle-build-action@v3
- name: Check build-logic # - name: Check build-logic
run: ./gradlew check -p build-logic # run: ./gradlew check -p build-logic
- name: Check spotless # - name: Check spotless
run: ./gradlew spotlessCheck --init-script gradle/init.gradle.kts --no-configuration-cache # run: ./gradlew spotlessCheck --init-script gradle/init.gradle.kts --no-configuration-cache
- name: Check Dependency Guard # - name: Check Dependency Guard
id: dependencyguard_verify # id: dependencyguard_verify
continue-on-error: true # continue-on-error: true
run: ./gradlew dependencyGuard # run: ./gradlew dependencyGuard
- name: Prevent updating Dependency Guard baselines if this is a fork # - name: Prevent updating Dependency Guard baselines if this is a fork
id: checkfork_dependencyguard # id: checkfork_dependencyguard
continue-on-error: false # continue-on-error: false
if: steps.dependencyguard_verify.outcome == 'failure' && github.event.pull_request.head.repo.full_name != github.repository # if: steps.dependencyguard_verify.outcome == 'failure' && github.event.pull_request.head.repo.full_name != github.repository
run: | # run: |
echo "::error::Dependency Guard failed, please update baselines with: ./gradlew dependencyGuardBaseline" && exit 1 # echo "::error::Dependency Guard failed, please update baselines with: ./gradlew dependencyGuardBaseline" && exit 1
# Runs if previous job failed # # Runs if previous job failed
- name: Generate new Dependency Guard baselines if verification failed and it's a PR # - name: Generate new Dependency Guard baselines if verification failed and it's a PR
id: dependencyguard_baseline # id: dependencyguard_baseline
if: steps.dependencyguard_verify.outcome == 'failure' && github.event_name == 'pull_request' # if: steps.dependencyguard_verify.outcome == 'failure' && github.event_name == 'pull_request'
run: | # run: |
./gradlew dependencyGuardBaseline # ./gradlew dependencyGuardBaseline
- name: Push new Dependency Guard baselines if available # - name: Push new Dependency Guard baselines if available
uses: stefanzweifel/git-auto-commit-action@v5 # uses: stefanzweifel/git-auto-commit-action@v5
if: steps.dependencyguard_baseline.outcome == 'success' # if: steps.dependencyguard_baseline.outcome == 'success'
with: # with:
file_pattern: '**/dependencies/*.txt' # file_pattern: '**/dependencies/*.txt'
disable_globbing: true # disable_globbing: true
commit_message: "🤖 Updates baselines for Dependency Guard" # commit_message: "🤖 Updates baselines for Dependency Guard"
- name: Run all local screenshot tests (Roborazzi) # - name: Run all local screenshot tests (Roborazzi)
id: screenshotsverify # id: screenshotsverify
continue-on-error: true # continue-on-error: true
run: ./gradlew verifyRoborazziDemoDebug # run: ./gradlew verifyRoborazziDemoDebug
- name: Prevent pushing new screenshots if this is a fork # - name: Prevent pushing new screenshots if this is a fork
id: checkfork_screenshots # id: checkfork_screenshots
continue-on-error: false # continue-on-error: false
if: steps.screenshotsverify.outcome == 'failure' && github.event.pull_request.head.repo.full_name != github.repository # if: steps.screenshotsverify.outcome == 'failure' && github.event.pull_request.head.repo.full_name != github.repository
run: | # run: |
echo "::error::Screenshot tests failed, please create a PR in your fork first." && exit 1 # echo "::error::Screenshot tests failed, please create a PR in your fork first." && exit 1
# Runs if previous job failed # # Runs if previous job failed
- name: Generate new screenshots if verification failed and it's a PR # - name: Generate new screenshots if verification failed and it's a PR
id: screenshotsrecord # id: screenshotsrecord
if: steps.screenshotsverify.outcome == 'failure' && github.event_name == 'pull_request' # if: steps.screenshotsverify.outcome == 'failure' && github.event_name == 'pull_request'
run: | # run: |
./gradlew recordRoborazziDemoDebug # ./gradlew recordRoborazziDemoDebug
- name: Push new screenshots if available # - name: Push new screenshots if available
uses: stefanzweifel/git-auto-commit-action@v5 # uses: stefanzweifel/git-auto-commit-action@v5
if: steps.screenshotsrecord.outcome == 'success' # if: steps.screenshotsrecord.outcome == 'success'
with: # with:
file_pattern: '*/*.png' # file_pattern: '*/*.png'
disable_globbing: true # disable_globbing: true
commit_message: "🤖 Updates screenshots" # commit_message: "🤖 Updates screenshots"
# Run local tests after screenshot tests to avoid wrong UP-TO-DATE. TODO: Ignore screenshots. # # Run local tests after screenshot tests to avoid wrong UP-TO-DATE. TODO: Ignore screenshots.
- name: Run local tests and create report # - name: Run local tests and create report
if: always() # if: always()
run: ./gradlew testDemoDebug :lint:test # run: ./gradlew testDemoDebug :lint:test
# Replace task exclusions with `-Pandroidx.baselineprofile.skipgeneration` when # # Replace task exclusions with `-Pandroidx.baselineprofile.skipgeneration` when
# https://android-review.googlesource.com/c/platform/frameworks/support/+/2602790 landed in a # # https://android-review.googlesource.com/c/platform/frameworks/support/+/2602790 landed in a
# release build # # release build
- name: Build all build type and flavor permutations # - name: Build all build type and flavor permutations
run: ./gradlew :app:assemble :benchmarks:assemble # run: ./gradlew :app:assemble :benchmarks:assemble
-x pixel6Api33ProdNonMinifiedReleaseAndroidTest # -x pixel6Api33ProdNonMinifiedReleaseAndroidTest
-x pixel6Api33DemoNonMinifiedReleaseAndroidTest # -x pixel6Api33DemoNonMinifiedReleaseAndroidTest
-x collectDemoNonMinifiedReleaseBaselineProfile # -x collectDemoNonMinifiedReleaseBaselineProfile
-x collectProdNonMinifiedReleaseBaselineProfile # -x collectProdNonMinifiedReleaseBaselineProfile
- name: Upload build outputs (APKs) # - name: Upload build outputs (APKs)
uses: actions/upload-artifact@v4 # uses: actions/upload-artifact@v4
with: # with:
name: APKs # name: APKs
path: '**/build/outputs/apk/**/*.apk' # path: '**/build/outputs/apk/**/*.apk'
- name: Upload JVM local results (XML) # - name: Upload JVM local results (XML)
if: always() # if: always()
uses: actions/upload-artifact@v4 # uses: actions/upload-artifact@v4
with: # with:
name: local-test-results # name: local-test-results
path: '**/build/test-results/test*UnitTest/**.xml' # path: '**/build/test-results/test*UnitTest/**.xml'
- name: Upload screenshot results (PNG) # - name: Upload screenshot results (PNG)
if: always() # if: always()
uses: actions/upload-artifact@v4 # uses: actions/upload-artifact@v4
with: # with:
name: screenshot-test-results # name: screenshot-test-results
path: '**/build/outputs/roborazzi/*_compare.png' # path: '**/build/outputs/roborazzi/*_compare.png'
- name: Check lint # - name: Check lint
run: ./gradlew :app:lintProdRelease :app-nia-catalog:lintRelease :lint:lint # run: ./gradlew :app:lintProdRelease :app-nia-catalog:lintRelease :lint:lint
- name: Upload lint reports (HTML) # - name: Upload lint reports (HTML)
if: always() # if: always()
uses: actions/upload-artifact@v4 # uses: actions/upload-artifact@v4
with: # with:
name: lint-reports # name: lint-reports
path: '**/build/reports/lint-results-*.html' # path: '**/build/reports/lint-results-*.html'
- name: Check badging # - name: Check badging
run: ./gradlew :app:checkProdReleaseBadging # run: ./gradlew :app:checkProdReleaseBadging
androidTest: # androidTest:
runs-on: ubuntu-latest # runs-on: ubuntu-latest
timeout-minutes: 55 # timeout-minutes: 55
strategy: # strategy:
matrix: # matrix:
api-level: [26, 30] # api-level: [26, 30]
steps: # steps:
- name: Delete unnecessary tools 🔧 # - name: Delete unnecessary tools 🔧
uses: jlumbroso/free-disk-space@v1.3.1 # uses: jlumbroso/free-disk-space@v1.3.1
with: # with:
android: false # Don't remove Android tools # android: false # Don't remove Android tools
tool-cache: true # Remove image tool cache - rm -rf "$AGENT_TOOLSDIRECTORY" # tool-cache: true # Remove image tool cache - rm -rf "$AGENT_TOOLSDIRECTORY"
dotnet: true # rm -rf /usr/share/dotnet # dotnet: true # rm -rf /usr/share/dotnet
haskell: true # rm -rf /opt/ghc... # haskell: true # rm -rf /opt/ghc...
swap-storage: true # rm -f /mnt/swapfile (4GiB) # swap-storage: true # rm -f /mnt/swapfile (4GiB)
docker-images: false # Takes 16s, enable if needed in the future # docker-images: false # Takes 16s, enable if needed in the future
large-packages: false # includes google-cloud-sdk and it's slow # large-packages: false # includes google-cloud-sdk and it's slow
- name: Enable KVM group perms # - name: Enable KVM group perms
run: | # run: |
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules # 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 control --reload-rules
sudo udevadm trigger --name-match=kvm # sudo udevadm trigger --name-match=kvm
ls /dev/kvm # ls /dev/kvm
- name: Checkout # - name: Checkout
uses: actions/checkout@v4 # uses: actions/checkout@v4
- name: Copy CI gradle.properties # - name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties # run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
- name: Set up JDK 17 # - name: Set up JDK 17
uses: actions/setup-java@v4 # uses: actions/setup-java@v4
with: # with:
distribution: 'zulu' # distribution: 'zulu'
java-version: 17 # java-version: 17
- name: Setup Gradle # - name: Setup Gradle
uses: gradle/gradle-build-action@v3 # uses: gradle/gradle-build-action@v3
- name: Build projects and run instrumentation tests # - name: Build projects and run instrumentation tests
uses: reactivecircus/android-emulator-runner@v2 # uses: reactivecircus/android-emulator-runner@v2
with: # with:
api-level: ${{ matrix.api-level }} # api-level: ${{ matrix.api-level }}
arch: x86_64 # arch: x86_64
disable-animations: true # disable-animations: true
disk-size: 6000M # disk-size: 6000M
heap-size: 600M # heap-size: 600M
script: ./gradlew connectedDemoDebugAndroidTest --daemon # script: ./gradlew connectedDemoDebugAndroidTest --daemon
- name: Run local tests (including Roborazzi) for the combined coverage report (only API 30) # - name: Run local tests (including Roborazzi) for the combined coverage report (only API 30)
if: matrix.api-level == 30 # if: matrix.api-level == 30
# There is no need to verify Roborazzi tests to generate coverage. # # There is no need to verify Roborazzi tests to generate coverage.
run: ./gradlew testDemoDebugUnitTest -Proborazzi.test.verify=false # Add Prod if we ever add JVM tests for prod # run: ./gradlew testDemoDebugUnitTest -Proborazzi.test.verify=false # Add Prod if we ever add JVM tests for prod
# Add `createProdDebugUnitTestCoverageReport` if we ever add JVM tests for prod # # Add `createProdDebugUnitTestCoverageReport` if we ever add JVM tests for prod
- name: Generate coverage reports for Debug variants (only API 30) # - name: Generate coverage reports for Debug variants (only API 30)
if: matrix.api-level == 30 # if: matrix.api-level == 30
run: ./gradlew createDemoDebugCombinedCoverageReport # run: ./gradlew createDemoDebugCombinedCoverageReport
- name: Upload test reports # - name: Upload test reports
if: always() # if: always()
uses: actions/upload-artifact@v4 # uses: actions/upload-artifact@v4
with: # with:
name: test-reports-${{ matrix.api-level }} # name: test-reports-${{ matrix.api-level }}
path: '**/build/reports/androidTests' # path: '**/build/reports/androidTests'
- name: Display local test coverage (only API 30) # - name: Display local test coverage (only API 30)
if: matrix.api-level == 30 # if: matrix.api-level == 30
id: jacoco # id: jacoco
uses: madrapps/jacoco-report@v1.6.1 # uses: madrapps/jacoco-report@v1.6.1
with: # with:
title: Combined test coverage report # title: Combined test coverage report
min-coverage-overall: 40 # min-coverage-overall: 40
min-coverage-changed-files: 60 # min-coverage-changed-files: 60
paths: | # paths: |
${{ github.workspace }}/**/build/reports/jacoco/**/*Report.xml # ${{ github.workspace }}/**/build/reports/jacoco/**/*Report.xml
token: ${{ secrets.GITHUB_TOKEN }} # token: ${{ secrets.GITHUB_TOKEN }}
- name: Upload local coverage reports (XML + HTML) (only API 30) # - name: Upload local coverage reports (XML + HTML) (only API 30)
if: matrix.api-level == 30 # if: matrix.api-level == 30
uses: actions/upload-artifact@v4 # uses: actions/upload-artifact@v4
with: # with:
name: coverage-reports # name: coverage-reports
if-no-files-found: error # if-no-files-found: error
compression-level: 1 # compression-level: 1
overwrite: false # overwrite: false
path: '**/build/reports/jacoco/' # path: '**/build/reports/jacoco/'
androidTestScreenshots: androidTestScreenshots:
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 55 timeout-minutes: 30
# needs: [test_and_apk, androidTest]
strategy: strategy:
matrix: matrix:
include: include:
- api-level: 27 # - api-level: 27
profile: pixel_5 # profile: pixel_5
target: default # target: default
- api-level: 33 - api-level: 33
profile: pixel_fold profile: pixel_fold
target: google_apis target: google_apis
# TODO: change from VanillaIceCream to 35 when that image is available # TODO: change from VanillaIceCream to 35 when that image is available
- api-level: VanillaIceCream # - api-level: VanillaIceCream
profile: pixel_fold # profile: pixel_fold
target: google_apis # target: google_apis
steps: steps:
- name: Delete unnecessary tools 🔧 - name: Delete unnecessary tools 🔧
@ -325,7 +326,7 @@ jobs:
profile: ${{ matrix.profile }} profile: ${{ matrix.profile }}
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
script: script:
./gradlew :app:connectedDemoDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.annotation=com.google.samples.apps.nowinandroid.ui.InstrumentedScreenshotTests --daemon ./gradlew :app:connectedDemoDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.annotation=com.google.samples.apps.nowinandroid.ui.InstrumentedScreenshotTests
- name: Prevent pushing new screenshots if this is a fork - name: Prevent pushing new screenshots if this is a fork
@ -351,7 +352,7 @@ jobs:
profile: ${{ matrix.profile }} profile: ${{ matrix.profile }}
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
script: script:
./gradlew :app:connectedDemoDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.annotation=com.google.samples.apps.nowinandroid.ui.InstrumentedScreenshotTests -Pdropshots.record --daemon --stacktrace adb logcat > logcat.log & ./gradlew :app:connectedDemoDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.annotation=com.google.samples.apps.nowinandroid.ui.InstrumentedScreenshotTests -Pdropshots.record
- name: Checkout new changes (in case another job already uploaded screenshots) - name: Checkout new changes (in case another job already uploaded screenshots)
@ -374,3 +375,10 @@ jobs:
with: with:
name: test-reports-${{ matrix.profile }}-${{ matrix.api-level }} name: test-reports-${{ matrix.profile }}-${{ matrix.api-level }}
path: '**/build/reports/androidTests' path: '**/build/reports/androidTests'
- name: Upload logcat
if: always()
uses: actions/upload-artifact@v4
with:
name: logcat-${{ matrix.profile }}-${{ matrix.api-level }}
path: logcat.log

4
gradle/libs.versions.toml
Unescape View File

@ -2,8 +2,8 @@
accompanist = "0.34.0" accompanist = "0.34.0"
androidDesugarJdkLibs = "2.0.4" androidDesugarJdkLibs = "2.0.4"
# AGP and tools should be updated together # AGP and tools should be updated together
androidGradlePlugin = "8.4.1" androidGradlePlugin = "8.6.0-alpha04"
androidTools = "31.4.0" androidTools = "31.6.0-alpha04"
androidxActivity = "1.8.2" androidxActivity = "1.8.2"
androidxAppCompat = "1.6.1" androidxAppCompat = "1.6.1"
androidxBrowser = "1.8.0" androidxBrowser = "1.8.0"

Write Preview
Loading…
Cancel
Save