Skip to content

Commit 25015d3

Browse files
authored
Fix tck not properly parsing ci.json (#875)
* Fix tck not properly parsing ci.json * Increase timeout
1 parent 8b04395 commit 25015d3

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

.github/workflows/test-changed-metadata.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
name: "🧪 ${{ matrix.coordinates }} (GraalVM for JDK ${{ matrix.version }} @ ${{ matrix.os }})"
5252
if: needs.get-changed-metadata.outputs.relevant-files-changed == 'true' && needs.get-changed-metadata.result == 'success' && needs.get-changed-metadata.outputs.none-found != 'true' && github.repository == 'oracle/graalvm-reachability-metadata'
5353
runs-on: ${{ matrix.os }}
54-
timeout-minutes: 240
54+
timeout-minutes: 480
5555
needs: get-changed-metadata
5656

5757
strategy:

ci.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"buildArgs": ["-verbose", "-Ob", "-H:+ReportExceptionStackTraces"],
2+
"buildArgs": ["--verbose", "-Ob", "-H:+ReportExceptionStackTraces"],
33
"generateMatrixBatchedCoordinates": {
44
"java": ["25", "latest-ea"],
55
"os": ["ubuntu-latest"]

tests/tck-build-logic/src/main/groovy/org.graalvm.internal.tck.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ overrideVal = overrideVal ?: "false"
5454
boolean override = overrideVal.toBoolean()
5555

5656
// Determine native-image build arguments from ci.json.
57-
def ciJsonFile = rootProject.file("ci.json")
57+
def ciJsonFile = tck.repoRoot.file("ci.json").get().asFile
5858
def nativeImageArgs = []
5959
if (ciJsonFile.exists()) {
6060
try {
@@ -71,6 +71,8 @@ if (ciJsonFile.exists()) {
7171
} catch (Exception ignored) {
7272
throw new GradleException("ci.json must contain the buildArgs")
7373
}
74+
} else {
75+
throw new GradleException("Required configuration file ci.json not found at expected path: ${ciJsonFile.absolutePath}\"")
7476
}
7577

7678
tck.testedLibraryVersion = libraryVersion

0 commit comments

Comments
 (0)