Skip to content

Commit

Permalink
8268185: Update GitHub Actions for jtreg 6
Browse files Browse the repository at this point in the history
Reviewed-by: erikj
  • Loading branch information
jonathan-gibbons committed Jun 3, 2021
1 parent 68ac871 commit e27c4d4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/submit.yml
Expand Up @@ -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
Expand All @@ -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'

Expand Down
4 changes: 2 additions & 2 deletions make/conf/test-dependencies
Expand Up @@ -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
Expand Down

1 comment on commit e27c4d4

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.