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

Merge 96a9c2ac1c into c5b604f72e

Browse Source
pull/1960/merge
Simon Marquis 22 hours ago committed by GitHub
parent c5b604f72e 96a9c2ac1c
commit 716d03be70
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 151 additions and 103 deletions
Show Stats Download Patch File Download Diff File

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

@ -1,4 +1,4 @@
name: Build name: CI
on: on:
workflow_dispatch: workflow_dispatch:
@ -12,37 +12,30 @@ concurrency:
cancel-in-progress: true cancel-in-progress: true
jobs: jobs:
test_and_apk: checks:
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
security-events: write security-events: write
timeout-minutes: 20
timeout-minutes: 60
steps: steps:
- name: Checkout - uses: actions/checkout@v4
uses: actions/checkout@v4
- name: Copy CI gradle.properties - uses: actions/setup-java@v5
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
- name: Set up JDK 21
uses: actions/setup-java@v4
with: with:
distribution: 'zulu' distribution: zulu
java-version: 21 java-version: 21
- name: Setup Gradle - uses: gradle/actions/setup-gradle@v4
uses: gradle/actions/setup-gradle@v4
with: with:
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }} cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
build-scan-publish: true build-scan-publish: true
build-scan-terms-of-use-url: "https://gradle.com/terms-of-service" build-scan-terms-of-use-url: https://gradle.com/terms-of-service
build-scan-terms-of-use-agree: "yes" build-scan-terms-of-use-agree: yes
- name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
- name: Check build-logic - name: Check build-logic
run: ./gradlew :build-logic:convention:check run: ./gradlew :build-logic:convention:check
@ -99,38 +92,29 @@ jobs:
disable_globbing: true disable_globbing: true
commit_message: "🤖 Updates graphs" commit_message: "🤖 Updates graphs"
- name: Run all local screenshot tests (Roborazzi) - name: Check badging
id: screenshotsverify run: ./gradlew :app:checkProdReleaseBadging
continue-on-error: true
run: ./gradlew verifyRoborazziDemoDebug
- name: Prevent pushing new screenshots if this is a fork assemble:
id: checkfork_screenshots runs-on: ubuntu-latest
continue-on-error: false timeout-minutes: 40
if: steps.screenshotsverify.outcome == 'failure' && github.event.pull_request.head.repo.full_name != github.repository steps:
run: | - uses: actions/checkout@v4
echo "::error::Screenshot tests failed, please create a PR in your fork first."
echo "Your fork's CI will take screenshots for your fork."
exit 1
# Runs if previous job failed - uses: actions/setup-java@v5
- name: Generate new screenshots if verification failed and it's a PR with:
id: screenshotsrecord distribution: zulu
if: steps.screenshotsverify.outcome == 'failure' && github.event_name == 'pull_request' java-version: 21
run: |
./gradlew recordRoborazziDemoDebug
- name: Push new screenshots if available - uses: gradle/actions/setup-gradle@v4
uses: stefanzweifel/git-auto-commit-action@v5
if: steps.screenshotsrecord.outcome == 'success'
with: with:
file_pattern: '*/*.png' cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
disable_globbing: true build-scan-publish: true
commit_message: "🤖 Updates screenshots" build-scan-terms-of-use-url: https://gradle.com/terms-of-service
build-scan-terms-of-use-agree: yes
# Run local tests after screenshot tests to avoid wrong UP-TO-DATE. TODO: Ignore screenshots. - name: Copy CI gradle.properties
- name: Run local tests run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
run: ./gradlew testDemoDebug :lint:test
- name: Build all build type and flavor permutations - name: Build all build type and flavor permutations
run: ./gradlew :app:assemble -PminifyWithR8=false run: ./gradlew :app:assemble -PminifyWithR8=false
@ -141,19 +125,26 @@ jobs:
name: APKs name: APKs
path: '**/build/outputs/apk/**/*.apk' path: '**/build/outputs/apk/**/*.apk'
- name: Upload JVM local results (XML) lint:
if: ${{ !cancelled() }} runs-on: ubuntu-latest
uses: actions/upload-artifact@v4 timeout-minutes: 20
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v5
with: with:
name: local-test-results distribution: zulu
path: '**/build/test-results/test*UnitTest/**.xml' java-version: 21
- name: Upload screenshot results (PNG) - uses: gradle/actions/setup-gradle@v4
if: ${{ !cancelled() }}
uses: actions/upload-artifact@v4
with: with:
name: screenshot-test-results cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
path: '**/build/outputs/roborazzi/*_compare.png' build-scan-publish: true
build-scan-terms-of-use-url: https://gradle.com/terms-of-service
build-scan-terms-of-use-agree: yes
- name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
- 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
@ -186,10 +177,79 @@ jobs:
sarif_file: './lint/' sarif_file: './lint/'
category: lint category: lint
- name: Check badging unit-tests:
run: ./gradlew :app:checkProdReleaseBadging runs-on: ubuntu-latest
permissions:
contents: write
pull-requests: write
security-events: write
timeout-minutes: 20
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v5
with:
distribution: zulu
java-version: 21
- uses: gradle/actions/setup-gradle@v4
with:
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
build-scan-publish: true
build-scan-terms-of-use-url: https://gradle.com/terms-of-service
build-scan-terms-of-use-agree: yes
- name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
- 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_screenshots
continue-on-error: false
if: steps.screenshotsverify.outcome == 'failure' && github.event.pull_request.head.repo.full_name != github.repository
run: |
echo "::error::Screenshot tests failed, please create a PR in your fork first."
echo "Your fork's CI will take screenshots for your fork."
exit 1
# Runs if previous job failed
- name: Generate new screenshots if verification failed and it's a PR
id: screenshotsrecord
if: steps.screenshotsverify.outcome == 'failure' && github.event_name == 'pull_request'
run: |
./gradlew recordRoborazziDemoDebug
androidTest: - name: Push new screenshots if available
uses: stefanzweifel/git-auto-commit-action@v5
if: steps.screenshotsrecord.outcome == 'success'
with:
file_pattern: '*/*.png'
disable_globbing: true
commit_message: "🤖 Updates screenshots"
# Run local tests after screenshot tests to avoid wrong UP-TO-DATE. TODO: Ignore screenshots.
- name: Run local tests
run: ./gradlew testDemoDebug :lint:test
- name: Upload JVM local results (XML)
if: ${{ !cancelled() }}
uses: actions/upload-artifact@v4
with:
name: local-test-results
path: '**/build/test-results/test*UnitTest/**.xml'
- name: Upload screenshot results (PNG)
if: ${{ !cancelled() }}
uses: actions/upload-artifact@v4
with:
name: screenshot-test-results
path: '**/build/outputs/roborazzi/*_compare.png'
instrumented-tests:
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 55 timeout-minutes: 55
strategy: strategy:
@ -208,6 +268,8 @@ jobs:
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
- uses: actions/checkout@v4
- 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
@ -215,25 +277,20 @@ jobs:
sudo udevadm trigger --name-match=kvm sudo udevadm trigger --name-match=kvm
ls /dev/kvm ls /dev/kvm
- name: Checkout - uses: actions/setup-java@v5
uses: actions/checkout@v4
- name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
- name: Set up JDK 21
uses: actions/setup-java@v4
with: with:
distribution: 'zulu' distribution: zulu
java-version: 21 java-version: 21
- name: Setup Gradle - uses: gradle/actions/setup-gradle@v4
uses: gradle/actions/setup-gradle@v4
with: with:
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }} cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
build-scan-publish: true build-scan-publish: true
build-scan-terms-of-use-url: "https://gradle.com/terms-of-service" build-scan-terms-of-use-url: https://gradle.com/terms-of-service
build-scan-terms-of-use-agree: "yes" build-scan-terms-of-use-agree: yes
- name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
- 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

26
.github/workflows/NightlyBaselineProfiles.yaml vendored
Unescape View File

@ -17,8 +17,7 @@ jobs:
timeout-minutes: 60 timeout-minutes: 60
steps: steps:
- name: Checkout - uses: actions/checkout@v4
uses: actions/checkout@v4
- name: Enable KVM group perms - name: Enable KVM group perms
run: | run: |
@ -27,22 +26,20 @@ jobs:
sudo udevadm trigger --name-match=kvm sudo udevadm trigger --name-match=kvm
ls /dev/kvm ls /dev/kvm
- name: Copy CI gradle.properties - uses: actions/setup-java@v5
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
- name: Set up JDK 17
uses: actions/setup-java@v4
with: with:
distribution: 'zulu' distribution: zulu
java-version: 17 java-version: 21
- name: Setup Gradle - uses: gradle/actions/setup-gradle@v4
uses: gradle/actions/setup-gradle@v4
with: with:
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }} cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
build-scan-publish: true build-scan-publish: true
build-scan-terms-of-use-url: "https://gradle.com/terms-of-service" build-scan-terms-of-use-url: https://gradle.com/terms-of-service
build-scan-terms-of-use-agree: "yes" build-scan-terms-of-use-agree: yes
- name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
- name: Setup Android SDK - name: Setup Android SDK
uses: android-actions/setup-android@v3 uses: android-actions/setup-android@v3
@ -50,9 +47,6 @@ jobs:
- name: Accept licenses - name: Accept licenses
run: yes | sdkmanager --licenses || true run: yes | sdkmanager --licenses || true
- name: Check build-logic
run: ./gradlew :build-logic:convention:check
- name: Setup GMD - name: Setup GMD
run: ./gradlew :benchmarks:pixel6Api33Setup run: ./gradlew :benchmarks:pixel6Api33Setup
--info --info

27
.github/workflows/Release.yml vendored
Unescape View File

@ -13,6 +13,8 @@ jobs:
timeout-minutes: 120 timeout-minutes: 120
steps: steps:
- uses: actions/checkout@v4
- 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
@ -20,26 +22,20 @@ jobs:
sudo udevadm trigger --name-match=kvm sudo udevadm trigger --name-match=kvm
ls /dev/kvm ls /dev/kvm
- name: Checkout - uses: actions/setup-java@v5
uses: actions/checkout@v4
- name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
- name: Set up JDK 17
uses: actions/setup-java@v4
with: with:
distribution: 'zulu' distribution: zulu
java-version: 17 java-version: 21
- name: Setup Gradle - uses: gradle/actions/setup-gradle@v4
uses: gradle/actions/setup-gradle@v4
with: with:
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }} cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
build-scan-publish: true build-scan-publish: true
build-scan-terms-of-use-url: "https://gradle.com/terms-of-service" build-scan-terms-of-use-url: https://gradle.com/terms-of-service
build-scan-terms-of-use-agree: "yes" build-scan-terms-of-use-agree: yes
- name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
- name: Setup Android SDK - name: Setup Android SDK
uses: android-actions/setup-android@v3 uses: android-actions/setup-android@v3
@ -60,6 +56,7 @@ jobs:
-Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true -Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true
-Pandroid.experimental.androidTest.numManagedDeviceShards=1 -Pandroid.experimental.androidTest.numManagedDeviceShards=1
-Pandroid.experimental.testOptions.managedDevices.maxConcurrentDevices=1 -Pandroid.experimental.testOptions.managedDevices.maxConcurrentDevices=1
- name: Create Release - name: Create Release
id: create_release id: create_release
uses: actions/create-release@v1 uses: actions/create-release@v1

Write Preview
Loading…
Cancel
Save