diff --git a/.github/actions/common/action.yml b/.github/actions/common/action.yml index 06916523fe1..ddb043049bc 100644 --- a/.github/actions/common/action.yml +++ b/.github/actions/common/action.yml @@ -54,7 +54,7 @@ inputs: runs: using: "composite" steps: - - if: ${{ inputs.free-space == 'true' }} + - if: ${{ inputs.free-space == 'true' && runner.os != 'Windows'}} # See https://github.com/actions/runner-images/issues/2840 name: Free disk space shell: bash diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 2b938b6084f..f9f9da03e1f 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -102,12 +102,13 @@ jobs: timeout-minutes: 30 strategy: matrix: - os: [ ubuntu-20.04 ] + os: [ ubuntu-20.04, windows-2022 ] moduleSet: [ core, it, dbclient, dbclient-oracle, others ] include: - { os: ubuntu-20.04, platform: linux } + - { os: windows-2022, platform: windows } runs-on: ${{ matrix.os }} - name: tests/${{ matrix.moduleSet }} + name: tests/${{ matrix.moduleSet }}-${{matrix.platform}} steps: - uses: actions/checkout@v4 with: @@ -319,6 +320,7 @@ jobs: include: - { os: ubuntu-20.04, platform: linux } - { os: macos-14, platform: macos } +# - { os: windows-2022, platform: windows } runs-on: ${{ matrix.os }} name: tests/packaging-${{ matrix.packaging }}-${{ matrix.platform }} steps: diff --git a/builder/tests/builder/src/test/java/io/helidon/builder/test/CustomNamedTest.java b/builder/tests/builder/src/test/java/io/helidon/builder/test/CustomNamedTest.java index 217023a93d6..525b20d96b0 100644 --- a/builder/tests/builder/src/test/java/io/helidon/builder/test/CustomNamedTest.java +++ b/builder/tests/builder/src/test/java/io/helidon/builder/test/CustomNamedTest.java @@ -56,7 +56,11 @@ void testIt() throws Exception { .build(); DefaultPrettyPrinter printer = new DefaultPrettyPrinter(); String json = mapper.writer(printer).writeValueAsString(customNamed); - assertThat(json, equalTo("{\n" + " \"stringSet\" : [ \"b\", \"a\", \"y\" ]\n" + "}")); + assertThat(json, equalTo("{" + + System.lineSeparator() + + " \"stringSet\" : [ \"b\", \"a\", \"y\" ]" + + System.lineSeparator() + + "}")); } } diff --git a/webclient/tests/grpc/src/test/java/io/helidon/webclient/grpc/tests/GrpcClientUriTest.java b/webclient/tests/grpc/src/test/java/io/helidon/webclient/grpc/tests/GrpcClientUriTest.java index a602688d6b4..2a88942db63 100644 --- a/webclient/tests/grpc/src/test/java/io/helidon/webclient/grpc/tests/GrpcClientUriTest.java +++ b/webclient/tests/grpc/src/test/java/io/helidon/webclient/grpc/tests/GrpcClientUriTest.java @@ -29,6 +29,8 @@ import io.helidon.webserver.testing.junit5.ServerTest; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -77,6 +79,7 @@ void testSupplier() { * Should fail to connect to first URI but succeed with second after retrying. */ @Test + @DisabledOnOs(value = OS.WINDOWS, disabledReason = "Windows runner is too slow") void testSupplierWithRetries() { CountDownLatch latch = new CountDownLatch(2); ClientUri badUri = ClientUri.create(URI.create("https://foo:8000"));