-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into move-android-instrume…
…nted-test
- Loading branch information
Showing
87 changed files
with
445 additions
and
480 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -45,13 +45,40 @@ jobs: | |
| - name: Check spotless | ||
| run: ./gradlew spotlessCheck --init-script gradle/init.gradle.kts --no-configuration-cache | ||
|
|
||
| - name: Check Dependency Guard | ||
| id: dependencyguard_verify | ||
| continue-on-error: true | ||
| run: ./gradlew dependencyGuard | ||
|
|
||
| - name: Prevent updating Dependency Guard baselines if this is a fork | ||
| id: checkfork_dependencyguard | ||
| continue-on-error: false | ||
| if: steps.dependencyguard_verify.outcome == 'failure' && github.event.pull_request.head.repo.full_name != github.repository | ||
| run: | | ||
| echo "::error::Dependency Guard failed, please update baselines with: ./gradlew dependencyGuardBaseline" && exit 1 | ||
| # Runs if previous job failed | ||
| - name: Generate new Dependency Guard baselines if verification failed and it's a PR | ||
| id: dependencyguard_baseline | ||
| if: steps.dependencyguard_verify.outcome == 'failure' && github.event_name == 'pull_request' | ||
| run: | | ||
| ./gradlew dependencyGuardBaseline | ||
| - name: Push new Dependency Guard baselines if available | ||
| uses: stefanzweifel/git-auto-commit-action@v5 | ||
| if: steps.dependencyguard_baseline.outcome == 'success' | ||
| with: | ||
| file_pattern: '**/dependencies/*.txt' | ||
| disable_globbing: true | ||
| commit_message: "🤖 Updates baselines for Dependency Guard" | ||
|
|
||
| - name: Run all local screenshot tests (Roborazzi) | ||
| id: screenshotsverify | ||
| continue-on-error: true | ||
| run: ./gradlew verifyRoborazziDemoDebug | ||
|
|
||
| - name: Prevent pushing new screenshots if this is a fork | ||
| id: checkfork | ||
| id: checkfork_screenshots | ||
| continue-on-error: false | ||
| if: steps.screenshotsverify.outcome == 'failure' && github.event.pull_request.head.repo.full_name != github.repository | ||
| run: | | ||
|
|
@@ -82,13 +109,9 @@ jobs: | |
| - name: Build all build type and flavor permutations | ||
| run: ./gradlew :app:assemble :benchmarks:assemble | ||
| -x pixel6Api33ProdNonMinifiedReleaseAndroidTest | ||
| -x pixel6Api33ProdNonMinifiedBenchmarkAndroidTest | ||
| -x pixel6Api33DemoNonMinifiedReleaseAndroidTest | ||
| -x pixel6Api33DemoNonMinifiedBenchmarkAndroidTest | ||
| -x collectDemoNonMinifiedReleaseBaselineProfile | ||
| -x collectDemoNonMinifiedBenchmarkBaselineProfile | ||
| -x collectProdNonMinifiedReleaseBaselineProfile | ||
| -x collectProdNonMinifiedBenchmarkBaselineProfile | ||
|
|
||
| - name: Upload build outputs (APKs) | ||
| uses: actions/upload-artifact@v4 | ||
|
|
@@ -117,13 +140,31 @@ jobs: | |
| run: ./gradlew :app:checkProdReleaseBadging | ||
|
|
||
| androidTest: | ||
| runs-on: macOS-latest # enables hardware acceleration in the virtual machine | ||
| runs-on: ubuntu-latest | ||
| timeout-minutes: 55 | ||
| strategy: | ||
| matrix: | ||
| api-level: [26, 30] | ||
|
|
||
| steps: | ||
| - name: Delete unnecessary tools 🔧 | ||
| uses: jlumbroso/[email protected] | ||
| with: | ||
| android: false # Don't remove Android tools | ||
| tool-cache: true # Remove image tool cache - rm -rf "$AGENT_TOOLSDIRECTORY" | ||
| dotnet: true # rm -rf /usr/share/dotnet | ||
| haskell: true # rm -rf /opt/ghc... | ||
| swap-storage: true # rm -f /mnt/swapfile (4GiB) | ||
| docker-images: false # Takes 16s, enable if needed in the future | ||
| large-packages: false # includes google-cloud-sdk and it's slow | ||
|
|
||
| - name: Enable KVM group perms | ||
| 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 | ||
| ls /dev/kvm | ||
| - name: Checkout | ||
| uses: actions/checkout@v4 | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
app/src/main/java/com/google/samples/apps/nowinandroid/util/ProfileVerifierLogger.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
| * Copyright 2023 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.samples.apps.nowinandroid.util | ||
|
|
||
| import android.util.Log | ||
| import androidx.profileinstaller.ProfileVerifier | ||
| import com.google.samples.apps.nowinandroid.core.network.di.ApplicationScope | ||
| import kotlinx.coroutines.CoroutineScope | ||
| import kotlinx.coroutines.guava.await | ||
| import kotlinx.coroutines.launch | ||
| import javax.inject.Inject | ||
|
|
||
| /** | ||
| * Logs the app's Baseline Profile Compilation Status using [ProfileVerifier]. | ||
| * | ||
| * When delivering through Google Play, the baseline profile is compiled during installation. | ||
| * In this case you will see the correct state logged without any further action necessary. | ||
| * To verify baseline profile installation locally, you need to manually trigger baseline | ||
| * profile installation. | ||
| * | ||
| * For immediate compilation, call: | ||
| * ```bash | ||
| * adb shell cmd package compile -f -m speed-profile com.example.macrobenchmark.target | ||
| * ``` | ||
| * You can also trigger background optimizations: | ||
| * ```bash | ||
| * adb shell pm bg-dexopt-job | ||
| * ``` | ||
| * Both jobs run asynchronously and might take some time complete. | ||
| * | ||
| * To see quick turnaround of the ProfileVerifier, we recommend using `speed-profile`. | ||
| * If you don't do either of these steps, you might only see the profile status reported as | ||
| * "enqueued for compilation" when running the sample locally. | ||
| * | ||
| * @see androidx.profileinstaller.ProfileVerifier.CompilationStatus.ResultCode | ||
| */ | ||
| class ProfileVerifierLogger @Inject constructor( | ||
| @ApplicationScope private val scope: CoroutineScope, | ||
| ) { | ||
| companion object { | ||
| private const val TAG = "ProfileInstaller" | ||
| } | ||
|
|
||
| operator fun invoke() = scope.launch { | ||
| val status = ProfileVerifier.getCompilationStatusAsync().await() | ||
| Log.d(TAG, "Status code: ${status.profileInstallResultCode}") | ||
| Log.d( | ||
| TAG, | ||
| when { | ||
| status.isCompiledWithProfile -> "App compiled with profile" | ||
| status.hasProfileEnqueuedForCompilation() -> "Profile enqueued for compilation" | ||
| else -> "Profile not compiled nor enqueued" | ||
| }, | ||
| ) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.