Skip to content

Commit fc9bf62

Browse files
committed
github: move svm gate to JDK latest
1 parent 2b1e654 commit fc9bf62

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

.github/workflows/main.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# The Universal Permissive License (UPL), Version 1.0
@@ -76,6 +76,7 @@ concurrency:
7676

7777
env:
7878
JAVA_HOME: ${{ github.workspace }}/jdk
79+
TOOLS_JAVA_HOME_LOCATION: ${{ github.workspace }}/tools-jdk
7980
LANG: en_US.UTF-8
8081
MX_GIT_CACHE: refcache
8182
MX_PATH: ${{ github.workspace }}/mx
@@ -111,7 +112,8 @@ jobs:
111112
PRIMARY: "espresso"
112113
# /substratevm
113114
- env:
114-
JDK_VERSION: "21"
115+
JDK_VERSION: "latest"
116+
TOOLS_JDK_VERSION: "21"
115117
GATE_TAGS: "style,fullbuild"
116118
PRIMARY: "substratevm"
117119
- env:
@@ -189,6 +191,11 @@ jobs:
189191
run: |
190192
mkdir jdk-dl
191193
${MX_PATH}/mx --java-home= fetch-jdk --jdk-id labsjdk-ce-${JDK_VERSION} --to jdk-dl --alias ${JAVA_HOME}
194+
- name: Fetch Tools JDK
195+
env: ${{ matrix.env }}
196+
if: ${{ matrix.env.TOOLS_JDK_VERSION != '' }}
197+
run: |
198+
${MX_PATH}/mx --java-home= fetch-jdk --jdk-id labsjdk-ce-${TOOLS_JDK_VERSION} --to jdk-dl --alias ${TOOLS_JAVA_HOME_LOCATION}
192199
- name: Update dependency cache
193200
if: ${{ env.MX_RUNS_DEBUG == 'true' || env.MX_RUNS_STYLE == 'true' }}
194201
run: sudo apt update
@@ -217,7 +224,7 @@ jobs:
217224
run: rm -rf .git
218225
- name: Build GraalVM and run gate with tags
219226
env: ${{ matrix.env }}
220-
run: ${MX_PATH}/mx --primary-suite-path ${PRIMARY} --java-home=${JAVA_HOME} gate --strict-mode ${{ matrix.env.GATE_OPTS }} --tags ${GATE_TAGS}
227+
run: ${MX_PATH}/mx --primary-suite-path ${PRIMARY} --java-home=${JAVA_HOME} --tools-java-home=${{ matrix.env.TOOLS_JDK_VERSION != '' && env.TOOLS_JAVA_HOME_LOCATION || '' }} gate --strict-mode ${{ matrix.env.GATE_OPTS }} --tags ${GATE_TAGS}
221228
if: ${{ matrix.env.GATE_TAGS != '' }}
222229
- name: Build GraalVM and run gate without tags
223230
env: ${{ matrix.env }}

0 commit comments

Comments
 (0)