diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e7ba7782e..0cd965aad 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ on: required: true jobs: run_build: - runs-on: ubuntu-latest + runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 - name: set up JDK 8 diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index a7c2eafe9..bc866f898 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -1,4 +1,3 @@ - name: Java CI with Gradle on: @@ -46,7 +45,7 @@ jobs: test: if: startsWith(github.ref, 'refs/tags/') != true - runs-on: ubuntu-latest + runs-on: ubuntu-18.04 strategy: fail-fast: false matrix: @@ -82,12 +81,12 @@ jobs: ./gradlew exhaustiveTest ./gradlew build - name: Check on failures - if: steps.unit_tests.outcome != 'success' + if: always() && steps.unit_tests.outcome != 'success' run: | cat /home/runner/java-sdk/core-api/build/reports/findbugs/main.html cat /home/runner/java-sdk/core-api/build/reports/findbugs/test.html - name: Check on success - if: steps.unit_tests.outcome == 'success' + if: always() && steps.unit_tests.outcome == 'success' run: | ./gradlew coveralls uploadArchives --console plain diff --git a/core-api/src/test/java/com/optimizely/ab/config/DatafileProjectConfigTestUtils.java b/core-api/src/test/java/com/optimizely/ab/config/DatafileProjectConfigTestUtils.java index b96815a39..49eaac733 100644 --- a/core-api/src/test/java/com/optimizely/ab/config/DatafileProjectConfigTestUtils.java +++ b/core-api/src/test/java/com/optimizely/ab/config/DatafileProjectConfigTestUtils.java @@ -491,7 +491,7 @@ private static void verifyExperiments(List actual, List assertThat(actualExperiment.getGroupId(), is(expectedExperiment.getGroupId())); assertThat(actualExperiment.getStatus(), is(expectedExperiment.getStatus())); assertThat(actualExperiment.getAudienceIds(), is(expectedExperiment.getAudienceIds())); - assertThat(actualExperiment.getAudienceConditions(), is(expectedExperiment.getAudienceConditions())); + assertEquals(actualExperiment.getAudienceConditions(), expectedExperiment.getAudienceConditions()); assertThat(actualExperiment.getUserIdToVariationKeyMap(), is(expectedExperiment.getUserIdToVariationKeyMap())); diff --git a/core-api/src/test/java/com/optimizely/ab/config/parser/JacksonConfigParserTest.java b/core-api/src/test/java/com/optimizely/ab/config/parser/JacksonConfigParserTest.java index e4e009e10..2e5dcb672 100644 --- a/core-api/src/test/java/com/optimizely/ab/config/parser/JacksonConfigParserTest.java +++ b/core-api/src/test/java/com/optimizely/ab/config/parser/JacksonConfigParserTest.java @@ -69,6 +69,7 @@ public void parseProjectConfigV3() throws Exception { verifyProjectConfig(actual, expected); } + @SuppressFBWarnings("NP_NULL_PARAM_DEREF") @Test public void parseProjectConfigV4() throws Exception { JacksonConfigParser parser = new JacksonConfigParser();