Skip to content

Commit efed552

Browse files
committed
fix typo
1 parent 5949c41 commit efed552

1 file changed

Lines changed: 59 additions & 0 deletions

File tree

.github/workflows/gradle.yml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ jobs:
140140
path: build/reports
141141
retention-days: 5
142142

143+
<<<<<<< HEAD
143144
windowsUnitTest:
144145
needs: build
145146
strategy:
@@ -520,6 +521,64 @@ jobs:
520521
name: assembly-distributed-test-reports-${{ matrix.os }}-${{ matrix.java }}
521522
path: build/reports
522523
retention-days: 5
524+
=======
525+
unitTest:
526+
needs: build
527+
strategy:
528+
fail-fast: false
529+
matrix:
530+
os: [windows-latest]
531+
distribution: ['liberica']
532+
java: ['8', '11', '17']
533+
runs-on: ${{ matrix.os }}
534+
steps:
535+
- uses: actions/checkout@v3
536+
- name: Set up JDK (include all 3 JDKs in env)
537+
uses: actions/setup-java@v3
538+
with:
539+
distribution: ${{ matrix.distribution }}
540+
java-version: |
541+
8
542+
11
543+
17
544+
- name: Setup Gradle
545+
uses: gradle/gradle-build-action@v2
546+
- name: Set JAVA_TEST_PATH to 8
547+
run: |
548+
echo "JAVA_TEST_PATH=${JAVA_HOME_8_X64}" >> $GITHUB_ENV
549+
if: matrix.java == '8'
550+
- name: Set JAVA_TEST_PATH to 11
551+
run: |
552+
echo "JAVA_TEST_PATH=${JAVA_HOME_11_X64}" >> $GITHUB_ENV
553+
if: matrix.java == '11'
554+
- name: Set JAVA_TEST_PATH to 17
555+
run: |
556+
echo "JAVA_TEST_PATH=${JAVA_HOME_17_X64}" >> $GITHUB_ENV
557+
if: matrix.java == '17'
558+
- name: Run unit tests
559+
run: |
560+
GRADLE_JVM_PATH=${JAVA_HOME_8_X64}
561+
JAVA_BUILD_PATH=${JAVA_HOME_8_X64}
562+
JAVA_BUILD_VERSION=11 # Use jdk 11 for build
563+
JAVA_TEST_VERSION=${{ matrix.java }}
564+
cp gradlew gradlewStrict
565+
sed -e 's/JAVA_HOME/GRADLE_JVM/g' -i.back gradlewStrict
566+
GRADLE_JVM=${GRADLE_JVM_PATH} JAVA_TEST_PATH=${JAVA_TEST_PATH} ./gradlewStrict \
567+
-PcompileJVM=${JAVA_BUILD_PATH} \
568+
-PcompileJVMVer=${JAVA_BUILD_VERSION} \
569+
-PtestJVM=${JAVA_TEST_PATH} \
570+
-PtestJVMVer=${JAVA_TEST_VERSION} \
571+
-PtestJava8Home=${JAVA_HOME_8_X64} \
572+
-PtestJava11Home=${JAVA_HOME_11_X64} \
573+
-PtestJava17Home=${JAVA_HOME_17_X64} \
574+
test --console=plain --no-daemon
575+
- uses: actions/upload-artifact@v3
576+
if: failure()
577+
with:
578+
name: unit-test-reports-${{ matrix.os }}-${{ matrix.java }}
579+
path: build/reports
580+
retention-days: 5
581+
>>>>>>> 54fc01fa63 (fix typo)
523582

524583
windowsIntegrationTest:
525584
needs: [apiCheck, unitTest]

0 commit comments

Comments
 (0)