From b2e12f3f9adeeb6137fcef8cee2023207c3bdcd5 Mon Sep 17 00:00:00 2001 From: Lazaro Clapp Date: Mon, 4 Jan 2021 14:30:02 -0500 Subject: [PATCH 01/14] Setup GitHub Actions CI and SNAPSHOT uploading. --- .buildscript/check_git_clean.sh | 5 ++ .github/workflows/continuous-integration.yml | 81 ++++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100755 .buildscript/check_git_clean.sh create mode 100644 .github/workflows/continuous-integration.yml diff --git a/.buildscript/check_git_clean.sh b/.buildscript/check_git_clean.sh new file mode 100755 index 0000000000..8668c07c9d --- /dev/null +++ b/.buildscript/check_git_clean.sh @@ -0,0 +1,5 @@ +if [ -n "$(git status --porcelain)" ]; then + echo 'warning: source tree contains uncommitted changes; .gitignore patterns may need to be fixed' + git status + false +fi diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml new file mode 100644 index 0000000000..c94a1dc78d --- /dev/null +++ b/.github/workflows/continuous-integration.yml @@ -0,0 +1,81 @@ +name: Continuous integration +on: + - pull_request + - push +jobs: + build: + name: "JDK ${{ matrix.java }} on ${{ matrix.os }}" + strategy: + matrix: + include: + - os: macos-latest + java: 8 + - os: ubuntu-latest + java: 8 + - os: ubuntu-latest + java: 11 + fail-fast: false + runs-on: ${{ matrix.os }} + steps: + - name: Check out NullAway sources + uses: actions/checkout@v2 + - name: Cache Gradle caches + uses: actions/cache@v1 + with: + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle') }} + restore-keys: ${{ runner.os }}-gradle-caches- + - name: Cache Gradle wrapper + uses: actions/cache@v1 + with: + path: ~/.gradle/wrapper + key: ${{ runner.os }}-gradlew-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }} + restore-keys: ${{ runner.os }}-gradlew-wrapper- + - name: 'Set up JDK ${{ matrix.java }}' + uses: actions/setup-java@v1 + with: + java-version: ${{ matrix.java }} + - name: Setup Android SDK + uses: android-actions/setup-android@v2 + - name: Build and test using Gradle and Java 8 + run: ./gradlew verGJF build + if: matrix.java == '8' + - name: Build and test using Gradle and Java 11 + run: ./gradlew :nullaway:test + if: matrix.java == '11' + - name: Report jacoco coverage + run: ./gradlew jacocoTestReport coveralls + if: runner.os == 'Linux' && matrix.java == '8' + - name: Check that Git tree is clean after build and test + run: ./buildscript/check-git-clean.sh + publish_snapshot: + name: 'Publish snapshot' + needs: [build] + if: github.event_name == 'push' && github.repository == 'uber/NullAway' && github.ref == 'refs/heads/master' + runs-on: ubuntu-latest + steps: + - name: 'Check out repository' + uses: actions/checkout@v2 + - name: Cache Gradle caches + uses: actions/cache@v1 + with: + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle') }} + restore-keys: ${{ runner.os }}-gradle-caches- + - name: Cache Gradle wrapper + uses: actions/cache@v1 + with: + path: ~/.gradle/wrapper + key: ${{ runner.os }}-gradlew-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }} + restore-keys: ${{ runner.os }}-gradlew-wrapper- + - name: 'Set up JDK 8' + uses: actions/setup-java@v1 + with: + java-version: 8 + - name: Setup Android SDK + uses: android-actions/setup-android@v2 + - name: 'Publish' + env: + SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }} + SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} + run: ./gradlew clean uploadArchives From 43c8a56a14322ce551e46b549198c97458ab35e0 Mon Sep 17 00:00:00 2001 From: Lazaro Clapp Date: Mon, 4 Jan 2021 14:37:33 -0500 Subject: [PATCH 02/14] Remove potentially conflicting Travis CI post-build changes. --- .github/workflows/continuous-integration.yml | 2 -- .travis.yml | 9 --------- 2 files changed, 11 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index c94a1dc78d..22c89ad4ae 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -35,8 +35,6 @@ jobs: uses: actions/setup-java@v1 with: java-version: ${{ matrix.java }} - - name: Setup Android SDK - uses: android-actions/setup-android@v2 - name: Build and test using Gradle and Java 8 run: ./gradlew verGJF build if: matrix.java == '8' diff --git a/.travis.yml b/.travis.yml index c9c04f889d..40aa0884c0 100755 --- a/.travis.yml +++ b/.travis.yml @@ -23,15 +23,6 @@ script: - if [[ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ]]; then ./gradlew verGJF build; fi - if [[ "$TRAVIS_JDK_VERSION" == "openjdk11" ]]; then ./gradlew :nullaway:test; fi -after_success: - - .buildscript/deploy_snapshot.sh - - ./gradlew jacocoTestReport coveralls - -env: - global: - - secure: Gmj9s887BQhPfGA2IRGBm0gusqS8L9ED8HnCUOge32fbL1huIjUx9xDfi9vsmecoIDQQOzRga33EcQCy1Yuba3KVuk2I8pk2z5OsMBf+1iR/qRO7/QNSCEqo9pTA8AVdNfpQqM6QLGpO064a1b7c35i/aRenUYDuIZlrVUhzr9v0QQ7QURjBsnQJkRd2Xb5AEDqlFQoaIRpnFlPl/B8sXQTiOratgnBp1kDm5tOZDZ6TqWdyLn0p3u4Qf6u8h6bJ3LUG0C7i48oS8qGwelZd0v1+GmivGI7bjbQw9ghBRjEIti9nW9bGkcYna1Q1EjkUJymJ4ilpKiSNEDwLtztEBiI3pSQ3NX1DJAdWsiA+XFQtId+Xi6b/u0R6VM4hCH0bWAtIASVafrY5Ad3tGbU0QMQENYoDI7odFoMwaWLMAJ3VtmfHrrDoqtBxFm2U37Lk3pDhulC9cx+elIwsQKY0s8p2V9UbWuXGgbIlcthqhST/+3CU+apwb2/Eq2DRF/gu05SnzEQnyjiL+XY8caF/qnVChD5j8LdoMaNCbzWG2qfHIxUtgIvGd/683pzshDbKW4CYST10Q5FFtsaCv6pMkCV+aLK53OQQY5PnfHPeIJQCqijcWFv+dS8mnx0WwvKhaVzGg97QX6p+Ok+9HAzkyovRwDLeGqcSlQQKyCXSW/A= - - secure: SiG/TzM0GQiwUrsW6Zq+5HirIxtiOOa/bjeBR50uzN2yOccK7ysqeLYNxgmO9Iu+76mMMccWfdSaP78YgjbY6aGoxGP3rOwt469AdUhXK+hslupKpnJI2UX0sYFl39mXmnHiRe/3W17aZA9NfinJyKJVBy2Bzm2aglN6kvHtS6qcBVGU35P0PIc6IwJQrJz17CcCEa7BVmKTGQPLXLQN8NrcCAjjiT5Egu3jJ6zEBzhk75xg63RM/SAV4gdRHJqo6JOZuGL9wIrvVZzc9s3jBB7BfJnSNw3W2A28JA5snfddyn+h+GTRFVhOywUToBNxplyPIiEwAkWsiAx1tpm1JPtI7tUN+TgLEj/qZgu0VIlC8jKuZ9JwtFUaprUaEGqQwiI/XjRuQYgFxiXqhqI2DVhNgBvQp1fUvEf5UD+gWr5Edh2tX6LsdzraXRgn13tULZ08aO+tTvTZUeSYpagrC9g6gQ6wq7gucmikOK/otw7+IPtOxR7DZ6qik60bvooqpaf439O2bVQh/cIwd6i8Afsf5sCAK+p54DfNBnED+03sIKcJD64IUiTFOFxjDGhwivsv/rf7/x3iyEZawWuQTP1rciDYlk9WvQjC3UkMFmT7zywa3PcFQjyn6yjNTy8plDaZ6ILXSyZTC6cW4rxy4iG3FKB+NnOfTC9tV/Z0/78= - notifications: email: false From 80187fd1cd637c12bc74ae5eb6375ae669d72871 Mon Sep 17 00:00:00 2001 From: Lazaro Clapp Date: Mon, 4 Jan 2021 14:53:13 -0500 Subject: [PATCH 03/14] Fix typos. Reduce duplicated jobs. --- .github/workflows/continuous-integration.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 22c89ad4ae..16a2f91a52 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -2,6 +2,9 @@ name: Continuous integration on: - pull_request - push + branches: + - master + - main jobs: build: name: "JDK ${{ matrix.java }} on ${{ matrix.os }}" @@ -45,7 +48,7 @@ jobs: run: ./gradlew jacocoTestReport coveralls if: runner.os == 'Linux' && matrix.java == '8' - name: Check that Git tree is clean after build and test - run: ./buildscript/check-git-clean.sh + run: ./buildscript/check_git_clean.sh publish_snapshot: name: 'Publish snapshot' needs: [build] From ea3f82d29519ab030c9cda363c25d30a5c23003d Mon Sep 17 00:00:00 2001 From: Lazaro Clapp Date: Mon, 4 Jan 2021 15:00:42 -0500 Subject: [PATCH 04/14] Trigger on push for all branches, but not again on PR creation (each PR creation implies a push) --- .github/workflows/continuous-integration.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 16a2f91a52..18e695cb25 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -1,10 +1,6 @@ name: Continuous integration on: - - pull_request - push - branches: - - master - - main jobs: build: name: "JDK ${{ matrix.java }} on ${{ matrix.os }}" From 4cf8e7c3ad1a039bb8ac7c5c64e261ee46a1ef48 Mon Sep 17 00:00:00 2001 From: Lazaro Clapp Date: Mon, 4 Jan 2021 15:03:54 -0500 Subject: [PATCH 05/14] Typos --- .github/workflows/continuous-integration.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 18e695cb25..69c2f46457 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -44,7 +44,7 @@ jobs: run: ./gradlew jacocoTestReport coveralls if: runner.os == 'Linux' && matrix.java == '8' - name: Check that Git tree is clean after build and test - run: ./buildscript/check_git_clean.sh + run: ./.buildscript/check_git_clean.sh publish_snapshot: name: 'Publish snapshot' needs: [build] @@ -69,8 +69,6 @@ jobs: uses: actions/setup-java@v1 with: java-version: 8 - - name: Setup Android SDK - uses: android-actions/setup-android@v2 - name: 'Publish' env: SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }} From 915e71ca882ef173831a6bcb9a6086c392f896bb Mon Sep 17 00:00:00 2001 From: Lazaro Clapp Date: Mon, 4 Jan 2021 16:28:58 -0500 Subject: [PATCH 06/14] Upgrade Coveralls for GitHub Actions compatibility --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4a2f0db45d..5b4c99ac3b 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ plugins { id "com.github.sherter.google-java-format" version "0.8" id "net.ltgt.errorprone" version "0.7" apply false id "com.github.johnrengelman.shadow" version "2.0.4" apply false - id 'com.github.kt3k.coveralls' version '2.6.3' apply false + id 'com.github.kt3k.coveralls' version '2.10.2' apply false id 'com.android.application' version '3.5.0' apply false } From b5eab420a34ed64b5993fe08395ee43cbe0154ff Mon Sep 17 00:00:00 2001 From: Lazaro Clapp Date: Mon, 4 Jan 2021 16:30:11 -0500 Subject: [PATCH 07/14] Temporary force SNAPSHOT release from outside master --- .github/workflows/continuous-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 69c2f46457..5b88aa21ad 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -48,7 +48,7 @@ jobs: publish_snapshot: name: 'Publish snapshot' needs: [build] - if: github.event_name == 'push' && github.repository == 'uber/NullAway' && github.ref == 'refs/heads/master' + if: github.event_name == 'push' && github.repository == 'uber/NullAway' && github.ref == 'refs/heads/lazaro_ci_to_github_actions' runs-on: ubuntu-latest steps: - name: 'Check out repository' From f556ee51a1e4b253dd669a7214a289731a8a2a4a Mon Sep 17 00:00:00 2001 From: Lazaro Clapp Date: Mon, 4 Jan 2021 16:40:11 -0500 Subject: [PATCH 08/14] Try prefix for SONATYPE secrets. --- .github/workflows/continuous-integration.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 5b88aa21ad..5e3aa2f9ca 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -71,6 +71,6 @@ jobs: java-version: 8 - name: 'Publish' env: - SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }} - SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} + ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }} + ORG_GRADLE_PROJECT_SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} run: ./gradlew clean uploadArchives From bbf5e031fd131b84ffdf38ccf0a21e2c1667eea8 Mon Sep 17 00:00:00 2001 From: Lazaro Clapp Date: Mon, 4 Jan 2021 17:03:14 -0500 Subject: [PATCH 09/14] SNAPSHOTS back to master branch. --- .github/workflows/continuous-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 5e3aa2f9ca..846fec276c 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -48,7 +48,7 @@ jobs: publish_snapshot: name: 'Publish snapshot' needs: [build] - if: github.event_name == 'push' && github.repository == 'uber/NullAway' && github.ref == 'refs/heads/lazaro_ci_to_github_actions' + if: github.event_name == 'push' && github.repository == 'uber/NullAway' && github.ref == 'refs/heads/master' runs-on: ubuntu-latest steps: - name: 'Check out repository' From 6607c96938666781fade630e5370d20474f3c13e Mon Sep 17 00:00:00 2001 From: Lazaro Clapp Date: Tue, 5 Jan 2021 12:49:05 -0500 Subject: [PATCH 10/14] Switch coverage plug-in and simplify GH Actions gradlew config. --- .github/workflows/continuous-integration.yml | 26 ++++++++----------- build.gradle | 4 +-- .../nullaway-integration-test/build.gradle | 11 -------- nullaway/build.gradle | 7 +++-- 4 files changed, 18 insertions(+), 30 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 846fec276c..81103db43f 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -18,30 +18,26 @@ jobs: steps: - name: Check out NullAway sources uses: actions/checkout@v2 - - name: Cache Gradle caches - uses: actions/cache@v1 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle') }} - restore-keys: ${{ runner.os }}-gradle-caches- - - name: Cache Gradle wrapper - uses: actions/cache@v1 - with: - path: ~/.gradle/wrapper - key: ${{ runner.os }}-gradlew-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }} - restore-keys: ${{ runner.os }}-gradlew-wrapper- - name: 'Set up JDK ${{ matrix.java }}' uses: actions/setup-java@v1 with: java-version: ${{ matrix.java }} - name: Build and test using Gradle and Java 8 - run: ./gradlew verGJF build + uses: eskatos/gradle-command-action@v1 + with: + arguments: verGJF build if: matrix.java == '8' - name: Build and test using Gradle and Java 11 - run: ./gradlew :nullaway:test + uses: eskatos/gradle-command-action@v1 + with: + arguments: :nullaway:test if: matrix.java == '11' - name: Report jacoco coverage - run: ./gradlew jacocoTestReport coveralls + env: + COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} + uses: eskatos/gradle-command-action@v1 + with: + arguments: test jacocoTestReport coverallsJacoco if: runner.os == 'Linux' && matrix.java == '8' - name: Check that Git tree is clean after build and test run: ./.buildscript/check_git_clean.sh diff --git a/build.gradle b/build.gradle index 5b4c99ac3b..b2848f7c2d 100644 --- a/build.gradle +++ b/build.gradle @@ -28,8 +28,8 @@ plugins { id "com.github.sherter.google-java-format" version "0.8" id "net.ltgt.errorprone" version "0.7" apply false id "com.github.johnrengelman.shadow" version "2.0.4" apply false - id 'com.github.kt3k.coveralls' version '2.10.2' apply false - id 'com.android.application' version '3.5.0' apply false + id "com.github.nbaztec.coveralls-jacoco" version "1.2.5" apply false + id "com.android.application" version "3.5.0" apply false } repositories { diff --git a/jar-infer/nullaway-integration-test/build.gradle b/jar-infer/nullaway-integration-test/build.gradle index 853d72b626..fa53b4f91e 100644 --- a/jar-infer/nullaway-integration-test/build.gradle +++ b/jar-infer/nullaway-integration-test/build.gradle @@ -15,9 +15,6 @@ */ plugins { id "java" - // For code coverage: - id 'jacoco' - id 'com.github.kt3k.coveralls' } sourceCompatibility = "1.8" @@ -38,11 +35,3 @@ test { maxHeapSize = "1024m" jvmArgs "-Xbootclasspath/p:${configurations.errorproneJavac.asPath}" } - -// From https://github.com/kt3k/coveralls-gradle-plugin -jacocoTestReport { - reports { - xml.enabled = true // coveralls plugin depends on xml format report - html.enabled = true - } -} diff --git a/nullaway/build.gradle b/nullaway/build.gradle index 2560ef03c4..d5e1583c0c 100644 --- a/nullaway/build.gradle +++ b/nullaway/build.gradle @@ -20,7 +20,7 @@ plugins { id "java" // For code coverage: id 'jacoco' - id 'com.github.kt3k.coveralls' + id 'com.github.nbaztec.coveralls-jacoco' } sourceCompatibility = "1.8" @@ -113,10 +113,13 @@ jacoco { toolVersion = "0.8.2" } -// From https://github.com/kt3k/coveralls-gradle-plugin jacocoTestReport { reports { xml.enabled = true // coveralls plugin depends on xml format report html.enabled = true } } + +coverallsJacoco { + reportPath = "nullaway/build/reports/jacoco/test/jacocoTestReport.xml" +} From 4e316bb4dc12c639a82781ce8897c8acc4495223 Mon Sep 17 00:00:00 2001 From: Lazaro Clapp Date: Tue, 5 Jan 2021 13:06:30 -0500 Subject: [PATCH 11/14] Upgrade Android SDK and build-tools --- .github/workflows/continuous-integration.yml | 2 +- gradle/dependencies.gradle | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 81103db43f..c32015e397 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -33,9 +33,9 @@ jobs: arguments: :nullaway:test if: matrix.java == '11' - name: Report jacoco coverage + uses: eskatos/gradle-command-action@v1 env: COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} - uses: eskatos/gradle-command-action@v1 with: arguments: test jacocoTestReport coverallsJacoco if: runner.os == 'Linux' && matrix.java == '8' diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 4ec9a6acab..315ca7ee4f 100755 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -51,11 +51,11 @@ def build = [ commonscli : "commons-cli:commons-cli:${versions.commonscli}", // android stuff - buildToolsVersion: "28.0.3", - compileSdkVersion: 28, + buildToolsVersion: "30.0.3", + compileSdkVersion: 30, ci: "true" == System.getenv("CI"), minSdkVersion: 16, - targetSdkVersion: 28, + targetSdkVersion: 30, ] From a10762a6150e9a491035c700ef5eaa28dfefd543 Mon Sep 17 00:00:00 2001 From: Lazaro Clapp Date: Tue, 5 Jan 2021 13:13:18 -0500 Subject: [PATCH 12/14] Repair Travis CI scripts (for now). --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 40aa0884c0..bc2788faa4 100755 --- a/.travis.yml +++ b/.travis.yml @@ -13,11 +13,11 @@ android: components: - tools - platform-tools - - build-tools-28.0.3 - - android-28 + - build-tools-30.0.3 + - android-30 before_install: - - if [[ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ]]; then yes | sdkmanager "platforms;android-28"; fi + - if [[ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ]]; then yes | sdkmanager "platforms;android-30"; fi script: - if [[ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ]]; then ./gradlew verGJF build; fi From 4a1966f163094240e661f036447d0b676e08c65b Mon Sep 17 00:00:00 2001 From: Lazaro Clapp Date: Tue, 5 Jan 2021 13:14:55 -0500 Subject: [PATCH 13/14] Try test on Windows and JDK11+Mac --- .github/workflows/continuous-integration.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index c32015e397..d8b8615f6d 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -9,10 +9,14 @@ jobs: include: - os: macos-latest java: 8 + - os: macos-latest + java: 11 - os: ubuntu-latest java: 8 - os: ubuntu-latest java: 11 + - os: windows-latest + java: 8 fail-fast: false runs-on: ${{ matrix.os }} steps: From 589d035f44d373dc13365fca92d6cd311b83edac Mon Sep 17 00:00:00 2001 From: Lazaro Clapp Date: Tue, 5 Jan 2021 13:25:16 -0500 Subject: [PATCH 14/14] Attempt to fix timeout --- .github/workflows/continuous-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index d8b8615f6d..5e78f26b31 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -41,7 +41,7 @@ jobs: env: COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} with: - arguments: test jacocoTestReport coverallsJacoco + arguments: jacocoTestReport coverallsJacoco if: runner.os == 'Linux' && matrix.java == '8' - name: Check that Git tree is clean after build and test run: ./.buildscript/check_git_clean.sh