rebase from develop

.github/workflows/gradle.yml

@@ -140,7 +140,6 @@ jobs:
           path: build/reports
           retention-days: 5
 
-<<<<<<< HEAD
   windowsUnitTest:
     needs: build
     strategy:
@@ -521,62 +520,6 @@ jobs:
           name: assembly-distributed-test-reports-${{ matrix.os }}-${{ matrix.java }}
           path: build/reports
           retention-days: 5
-=======
-  unitTest:
-   needs: build
-   strategy:
-     fail-fast: false
-     matrix:
-       os: [windows-latest]
-       distribution: ['liberica']
-       java: ['8', '11', '17']
-   runs-on: ${{ matrix.os }}
-   steps:
-   - uses: actions/checkout@v3
-   - name: Set up JDK (include all 3 JDKs in env)
-     uses: actions/setup-java@v3
-     with:
-       distribution: ${{ matrix.distribution }}
-       java-version: |
-         8
-         11
-         17
-   - name: Setup Gradle
-     uses: gradle/gradle-build-action@v2
-   - name: Set JAVA_TEST_PATH to 8
-     run: |
-       echo "JAVA_TEST_PATH=${JAVA_HOME_8_X64}" >> $GITHUB_ENV
-     if: matrix.java == '8'
-   - name: Set JAVA_TEST_PATH to 11
-     run: |
-       echo "JAVA_TEST_PATH=${JAVA_HOME_11_X64}" >> $GITHUB_ENV
-     if: matrix.java == '11'
-   - name: Set JAVA_TEST_PATH to 17
-     run: |
-       echo "JAVA_TEST_PATH=${JAVA_HOME_17_X64}" >> $GITHUB_ENV
-     if: matrix.java == '17'
-   - name: Run unit tests
-     run: |
-       $env:GRADLE_JVM_PATH=$env:JAVA_HOME_8_X64
-       $env:JAVA_BUILD_PATH=$env:JAVA_HOME_8_X64
-       $env:JAVA_BUILD_VERSION=11 # Use jdk 11 for build
-       $env:JAVA_TEST_VERSION=${{ matrix.java }}
-       GRADLE_JVM=$env:GRADLE_JVM_PATH JAVA_TEST_PATH=$env:JAVA_TEST_PATH gradlew.bat \
-                -PcompileJVM=$env:JAVA_BUILD_PATH \
-                -PcompileJVMVer=$env:JAVA_BUILD_VERSION \
-                -PtestJVM=$env:JAVA_TEST_PATH \
-                -PtestJVMVer=$env:JAVA_TEST_VERSION \
-                -PtestJava8Home=$env:JAVA_HOME_8_X64 \
-                -PtestJava11Home=$env:JAVA_HOME_11_X64 \
-                -PtestJava17Home=$env:JAVA_HOME_17_X64 \
-                test --console=plain --no-daemon
-   - uses: actions/upload-artifact@v3
-     if: failure()
-     with:
-       name: unit-test-reports-${{ matrix.os }}-${{ matrix.java }}
-       path: build/reports
-       retention-days: 5
->>>>>>> 54fc01fa63 (fix typo)
 
   windowsIntegrationTest:
     needs: [apiCheck, unitTest]