|
1 | 1 | #
|
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. |
3 | 3 | # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
4 | 4 | #
|
5 | 5 | # The Universal Permissive License (UPL), Version 1.0
|
@@ -76,6 +76,7 @@ concurrency:
|
76 | 76 |
|
77 | 77 | env:
|
78 | 78 | JAVA_HOME: ${{ github.workspace }}/jdk
|
| 79 | + TOOLS_JAVA_HOME_LOCATION: ${{ github.workspace }}/tools-jdk |
79 | 80 | LANG: en_US.UTF-8
|
80 | 81 | MX_GIT_CACHE: refcache
|
81 | 82 | MX_PATH: ${{ github.workspace }}/mx
|
@@ -111,7 +112,8 @@ jobs:
|
111 | 112 | PRIMARY: "espresso"
|
112 | 113 | # /substratevm
|
113 | 114 | - env:
|
114 |
| - JDK_VERSION: "21" |
| 115 | + JDK_VERSION: "latest" |
| 116 | + TOOLS_JDK_VERSION: "21" |
115 | 117 | GATE_TAGS: "style,fullbuild"
|
116 | 118 | PRIMARY: "substratevm"
|
117 | 119 | - env:
|
@@ -183,6 +185,11 @@ jobs:
|
183 | 185 | run: |
|
184 | 186 | mkdir jdk-dl
|
185 | 187 | ${MX_PATH}/mx --java-home= fetch-jdk --jdk-id labsjdk-ce-${JDK_VERSION} --to jdk-dl --alias ${JAVA_HOME}
|
| 188 | + - name: Fetch Tools JDK |
| 189 | + env: ${{ matrix.env }} |
| 190 | + if: ${{ matrix.env.TOOLS_JDK_VERSION != '' }} |
| 191 | + run: | |
| 192 | + ${MX_PATH}/mx --java-home= fetch-jdk --jdk-id labsjdk-ce-${TOOLS_JDK_VERSION} --to jdk-dl --alias ${TOOLS_JAVA_HOME_LOCATION} |
186 | 193 | - name: Update dependency cache
|
187 | 194 | if: ${{ env.MX_RUNS_DEBUG == 'true' || env.MX_RUNS_STYLE == 'true' }}
|
188 | 195 | run: sudo apt update
|
@@ -211,7 +218,7 @@ jobs:
|
211 | 218 | run: rm -rf .git
|
212 | 219 | - name: Build GraalVM and run gate with tags
|
213 | 220 | env: ${{ matrix.env }}
|
214 |
| - run: ${MX_PATH}/mx --primary-suite-path ${PRIMARY} --java-home=${JAVA_HOME} gate --strict-mode ${{ matrix.env.GATE_OPTS }} --tags ${GATE_TAGS} |
| 221 | + 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} |
215 | 222 | if: ${{ matrix.env.GATE_TAGS != '' }}
|
216 | 223 | - name: Build GraalVM and run gate without tags
|
217 | 224 | env: ${{ matrix.env }}
|
|
0 commit comments