|
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: |
@@ -189,6 +191,11 @@ jobs: |
189 | 191 | run: | |
190 | 192 | mkdir jdk-dl |
191 | 193 | ${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} |
192 | 199 | - name: Update dependency cache |
193 | 200 | if: ${{ env.MX_RUNS_DEBUG == 'true' || env.MX_RUNS_STYLE == 'true' }} |
194 | 201 | run: sudo apt update |
@@ -217,7 +224,7 @@ jobs: |
217 | 224 | run: rm -rf .git |
218 | 225 | - name: Build GraalVM and run gate with tags |
219 | 226 | 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} |
221 | 228 | if: ${{ matrix.env.GATE_TAGS != '' }} |
222 | 229 | - name: Build GraalVM and run gate without tags |
223 | 230 | env: ${{ matrix.env }} |
|
0 commit comments