diff options
author | Brett Chabot <brettchabot@google.com> | 2023-10-17 16:59:42 -0700 |
---|---|---|
committer | Brett Chabot <brettchabot@google.com> | 2023-10-17 16:59:42 -0700 |
commit | 0d1459b539c70dd249d593bf8ad6b16a3fa07d56 (patch) | |
tree | 350a9c61648f575211ffcb08c212331bf4a3ecb1 /.github | |
parent | 8de2eb68e905649781c6237b49df0d16b5e18614 (diff) | |
parent | 1012128051ff768cdd650d926e2ef78882f06cd2 (diff) | |
download | robolectric-0d1459b539c70dd249d593bf8ad6b16a3fa07d56.tar.gz |
Merge branch 'google' into 'master'
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/copybara_build_and_test.yml | 40 | ||||
-rw-r--r-- | .github/workflows/tests.yml | 8 |
2 files changed, 44 insertions, 4 deletions
diff --git a/.github/workflows/copybara_build_and_test.yml b/.github/workflows/copybara_build_and_test.yml new file mode 100644 index 000000000..5b90d3cbe --- /dev/null +++ b/.github/workflows/copybara_build_and_test.yml @@ -0,0 +1,40 @@ +name: Copybara tests + +on: + pull_request: + branches: [ google ] + +permissions: + contents: read + +jobs: + copybara-tests: + runs-on: ubuntu-22.04 + + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + distribution: 'zulu' + java-version: 17 + + - uses: gradle/gradle-build-action@v2 + + - name: Build + run: | + SKIP_ERRORPRONE=true SKIP_JAVADOC=true \ + ./gradlew assemble testClasses --parallel --stacktrace --no-watch-fs + + - name: Integration tests + run: | + # Only run integration tests on Copybara PRs + (cd integration_tests && \ + SKIP_ERRORPRONE=true SKIP_JAVADOC=true \ + ../gradlew test --info --stacktrace --continue --parallel --no-watch-fs \ + -Drobolectric.alwaysIncludeVariantMarkersInTestName=true \ + -Drobolectric.enabledSdks=34 \ + -Dorg.gradle.workers.max=2 \ + -x :integration_tests:nativegraphics:test \ + ) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 13528390d..1df25bd2b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -2,12 +2,12 @@ name: Tests on: push: - branches: [ master, 'robolectric-*.x' ] + branches: [ master, 'robolectric-*.x', 'google' ] paths-ignore: - '**.md' pull_request: - branches: [ master, google ] + branches: [ master ] paths-ignore: - '**.md' @@ -35,7 +35,7 @@ jobs: - name: Build run: | SKIP_ERRORPRONE=true SKIP_JAVADOC=true \ - ./gradlew clean assemble testClasses --parallel --stacktrace --no-watch-fs + ./gradlew assemble testClasses --parallel --stacktrace --no-watch-fs unit-tests: runs-on: ubuntu-22.04 @@ -43,7 +43,7 @@ jobs: strategy: fail-fast: false matrix: - api-versions: [ '19,21,22', '23,24,25', '26,27,28', '29,30,31', '32,33' ] + api-versions: [ '19,21,34', '22,23,33', '24,25,32', '26,27,28', '29,30,31', ] steps: - uses: actions/checkout@v4 |