From e27c4d463d920994b79b8163f063ad74f6ee5d59 Mon Sep 17 00:00:00 2001 From: Jonathan Gibbons <jjg@openjdk.org> Date: Thu, 3 Jun 2021 19:39:28 +0000 Subject: [PATCH] 8268185: Update GitHub Actions for jtreg 6 Reviewed-by: erikj --- .github/workflows/submit.yml | 4 ++-- make/conf/test-dependencies | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml index 4993127c952..4ab84bf4362 100644 --- a/.github/workflows/submit.yml +++ b/.github/workflows/submit.yml @@ -67,7 +67,7 @@ jobs: if: steps.check_submit.outputs.should_run != 'false' - name: Determine the jtreg ref to checkout - run: "echo JTREG_REF=jtreg${{ fromJson(steps.check_deps.outputs.dependencies).JTREG_VERSION }}-${{ fromJson(steps.check_deps.outputs.dependencies).JTREG_BUILD }} >> $GITHUB_ENV" + run: "echo JTREG_REF=jtreg-${{ fromJson(steps.check_deps.outputs.dependencies).JTREG_VERSION }}+${{ fromJson(steps.check_deps.outputs.dependencies).JTREG_BUILD }} >> $GITHUB_ENV" if: steps.check_submit.outputs.should_run != 'false' - name: Check if a jtreg image is present in the cache @@ -87,7 +87,7 @@ jobs: if: steps.check_submit.outputs.should_run != 'false' && steps.jtreg.outputs.cache-hit != 'true' - name: Build jtreg - run: sh make/build-all.sh ${JAVA_HOME_8_X64} + run: bash make/build.sh --jdk ${JAVA_HOME_8_X64} working-directory: jtreg if: steps.check_submit.outputs.should_run != 'false' && steps.jtreg.outputs.cache-hit != 'true' diff --git a/make/conf/test-dependencies b/make/conf/test-dependencies index 159b6073a5f..4619ab74447 100644 --- a/make/conf/test-dependencies +++ b/make/conf/test-dependencies @@ -26,8 +26,8 @@ # Versions and download locations for dependencies used by pre-submit testing. BOOT_JDK_VERSION=16 -JTREG_VERSION=5.1 -JTREG_BUILD=b01 +JTREG_VERSION=6 +JTREG_BUILD=1 GTEST_VERSION=1.8.1 LINUX_X64_BOOT_JDK_FILENAME=openjdk-16_linux-x64_bin.tar.gz