diff options
author | Aurimas Liutikas <aurimas@google.com> | 2021-05-12 23:09:46 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-12 23:09:46 +0000 |
commit | 8c15c512c2fe4601027c429e9111bb2d2d4459e3 (patch) | |
tree | 6f59a75348d07612173246ac6c4fca04bde0df2c /.github | |
parent | 367408b057fd78df809109a1a05cd05cd47d435d (diff) | |
parent | 8630738d0a775a2f8e5bc09c437556bd75d8b620 (diff) | |
download | dagger2-android12-qpr3-s4-release.tar.gz |
Merge "Revert "Merge commit 'upstream/dagger-2.35.1^'"" am: 5882ce8935 am: 5480a6c05f am: 8630738d0aandroid-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev
Original change: https://android-review.googlesource.com/c/platform/external/dagger2/+/1705751
Change-Id: I41842348fb1a8f2595da4a7bd2a0b6792341b26a
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/ci.yml | 59 |
1 files changed, 3 insertions, 56 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c818cc98..328d4b1df 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,43 +5,12 @@ on: branches: - master pull_request: - branches: - - master - -env: - # Our Bazel builds currently rely on JDK 8. - USE_JAVA_VERSION: '8' - # Our Bazel builds currently rely on 3.7.1. The version is set via - # baselisk by USE_BAZEL_VERSION: https://github.com/bazelbuild/bazelisk. - USE_BAZEL_VERSION: '3.7.1' jobs: - validate-latest-dagger-version: - name: 'Validate Dagger version' - runs-on: ubuntu-latest - steps: - # Cancel previous runs on the same branch to avoid unnecessary parallel - # runs of the same job. See https://github.com/google/go-github/pull/1821 - - name: Cancel previous - uses: styfle/cancel-workflow-action@0.8.0 - with: - access_token: ${{ github.token }} - - name: 'Check out gh-pages repository' - uses: actions/checkout@v2 - with: - ref: 'refs/heads/gh-pages' - path: gh-pages - - name: 'Validate latest Dagger version' - run: ./gh-pages/.github/scripts/validate-latest-dagger-version.sh gh-pages/_config.yml bazel-test: name: 'Bazel tests' - needs: validate-latest-dagger-version runs-on: ubuntu-latest steps: - - name: 'Install Java ${{ env.USE_JAVA_VERSION }}' - uses: actions/setup-java@v1 - with: - java-version: '${{ env.USE_JAVA_VERSION }}' - name: 'Check out repository' uses: actions/checkout@v2 - name: 'Cache local Maven repository' @@ -70,7 +39,7 @@ jobs: restore-keys: | ${{ runner.os }}-gradle- - name: 'Run Bazel tests' - run: bazel test --test_output=errors //... --keep_going + run: bazel test --test_output=errors //... shell: bash - name: 'Install local snapshot' run: ./util/install-local-snapshot.sh @@ -131,12 +100,6 @@ jobs: - name: 'Gradle Android local tests (AGP ${{ matrix.agp }})' run: ./util/run-local-gradle-android-tests.sh "${{ matrix.agp }}" shell: bash - - name: 'Upload test reports (AGP ${{ matrix.agp }})' - if: ${{ always() }} - uses: actions/upload-artifact@v2 - with: - name: tests-reports-agp-${{ matrix.agp }} - path: ${{ github.workspace }}/**/build/reports/tests/* artifact-android-emulator-tests: name: 'Artifact Android emulator tests (API 30)' needs: bazel-test @@ -167,12 +130,6 @@ jobs: api-level: 30 target: google_apis script: ./util/run-local-emulator-tests.sh - - name: 'Upload test reports (API 30)' - if: ${{ always() }} - uses: actions/upload-artifact@v2 - with: - name: androidTests-reports-api-30 - path: ${{ github.workspace }}/**/build/reports/androidTests/connected/* publish-snapshot: name: 'Publish snapshot' # TODO(bcorso): Consider also waiting on artifact-android-emulator-tests @@ -181,10 +138,6 @@ jobs: if: github.event_name == 'push' && github.repository == 'google/dagger' && github.ref == 'refs/heads/master' runs-on: ubuntu-latest steps: - - name: 'Install Java ${{ env.USE_JAVA_VERSION }}' - uses: actions/setup-java@v1 - with: - java-version: '${{ env.USE_JAVA_VERSION }}' - name: 'Check out repository' uses: actions/checkout@v2 - name: 'Cache local Maven repository' @@ -233,8 +186,8 @@ jobs: # See https://github.com/marketplace/actions/android-emulator-runner runs-on: macos-latest strategy: - matrix: # Run on 16 (PreL), 21 (L), and 26 (O). - api-level: [16, 21, 26] + matrix: + api-level: [16, 17, 18, 19, 21, 22, 23, 24, 25, 26, 27, 29] steps: - name: 'Check out repository' uses: actions/checkout@v2 @@ -259,9 +212,3 @@ jobs: api-level: ${{ matrix.api-level }} target: google_apis script: ./util/run-local-emulator-tests.sh - - name: 'Upload test reports (API ${{ matrix.api-level }})' - if: ${{ always() }} - uses: actions/upload-artifact@v2 - with: - name: androidTests-report-api-${{ matrix.api-level }} - path: ${{ github.workspace }}/**/build/reports/androidTests/connected/* |