Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

8268185: Update GitHub Actions for jtreg 6 #1239

Closed
wants to merge 3 commits into from
Closed

8268185: Update GitHub Actions for jtreg 6 #1239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d19dec
Backport 3482cb87fd94e6445ca243722851daa90c00a2c8
gdams Jul 19, 2022
179d522
Backport e27c4d463d920994b79b8163f063ad74f6ee5d59
gdams Jul 18, 2022
493b8b1
Merge branch 'master' of https://git.openjdk.org/jdk11u-dev into jtreg6
gdams Jul 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/submit.yml
View file
Open in desktop
Expand Up @@ -90,7 +90,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: Determine the jtreg version to build
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
if: steps.check_submit.outputs.should_run != 'false' && steps.jtreg.outputs.cache-hit != 'true'

- name: Build jtreg
run: bash 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
View file
Open in desktop
Expand Up @@ -26,8 +26,8 @@
# Versions and download locations for dependencies used by pre-submit testing.

BOOT_JDK_VERSION=11
JTREG_VERSION=5.1
JTREG_BUILD=b01
JTREG_VERSION=6
JTREG_BUILD=1
GTEST_VERSION=1.8.1

LINUX_X64_BOOT_JDK_FILENAME=openjdk-11.0.14.1_linux-x64_bin.tar.gz
Expand Down