From b3634db1207de682310aadc3f33649eec3c52ed5 Mon Sep 17 00:00:00 2001 From: songxiaosheng Date: Mon, 18 Dec 2023 19:13:47 +0800 Subject: [PATCH] :green_heart: remove windows and add jdk17 --- .github/workflows/ci.yml | 4 ++-- .github/workflows/conformance.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b9d607d6..e8811904 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, windows-2019 ] + os: [ ubuntu-latest] jdk: [ 8, 11 ] steps: - uses: actions/checkout@v2 @@ -42,7 +42,7 @@ jobs: ./mvnw --batch-mode -U -e --no-transfer-progress clean test verify -Pjacoco -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false -Dcheckstyle_unix.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true - name: "Test with Maven" timeout-minutes: 50 - if: ${{ startsWith( matrix.os, 'windows') }} + if: ${{ startsWith( matrix.os) }} run: | cd ./dubbo-spi-extensions ./mvnw --batch-mode -U -e --no-transfer-progress clean test verify -Pjacoco -D"http.keepAlive=false" -D"maven.wagon.http.pool=false" -D"maven.wagon.httpconnectionManager.ttlSeconds=120" -D"maven.wagon.http.retryHandler.count=5" -DskipTests=false -DskipIntegrationTests=true -D"checkstyle.skip=false" -D"checkstyle_unix.skip=true" -D"rat.skip=false" -D"maven.javadoc.skip=true" diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index dd3700bf..c9150516 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -81,7 +81,7 @@ jobs: strategy: fail-fast: false matrix: - java: [ 8,11 ] + java: [ 8,11,17 ] #testjob id list MUST match 'JOB_COUNT' of 'prepare_test' job_id: [ 1,2,3 ] steps: @@ -122,7 +122,7 @@ jobs: strategy: fail-fast: false matrix: - java: [ 8,11 ] + java: [ 8,11,17 ] env: JAVA_VER: ${{matrix.java}} steps: