From 55e6f2032484b7078d51b23d3d1e4c0a2e56193b Mon Sep 17 00:00:00 2001 From: Adam Thorpe Date: Thu, 25 Jun 2020 12:15:36 +0100 Subject: [PATCH 1/2] WIP add riscv64 --- .../src/main/resources/JSON/platforms.json | 18 ++++++++++++++++++ .../AssetsResourceFeatureReleasePathTest.kt | 5 +++++ .../api/AssetsResourceVersionPathTest.kt | 6 ++++++ .../adoptopenjdk/api/v3/models/Architecture.kt | 6 ++++-- 4 files changed, 33 insertions(+), 2 deletions(-) diff --git a/adoptopenjdk-api-v3-frontend/src/main/resources/JSON/platforms.json b/adoptopenjdk-api-v3-frontend/src/main/resources/JSON/platforms.json index d3f2201a..87bfb29d 100644 --- a/adoptopenjdk-api-v3-frontend/src/main/resources/JSON/platforms.json +++ b/adoptopenjdk-api-v3-frontend/src/main/resources/JSON/platforms.json @@ -250,6 +250,24 @@ "checksumAutoCommandHint": " (the command must be run on a terminal in the same directory you download the binary file)", "checksumAutoCommand": "curl -O -L FILEHASHURL && shasum -a 256 -c FILEHASHNAME", "osDetectionString": "not-to-be-detected" + }, + { + "officialName": "Linux riscv64", + "searchableName": "RISCV64_LINUX", + "attributes": { + "heapSize": "normal", + "os": "linux", + "architecture": "riscv64" + }, + "logo": "riscv.png", + "binaryExtension": ".tar.gz", + "installerExtension": "no-installer-available", + "installCommand": "tar -xf FILENAME", + "pathCommand": "export PATH=$PWD/DIRNAME/bin:$PATH", + "checksumCommand": "sha256sum FILENAME", + "checksumAutoCommandHint": " (the command must be run on a terminal in the same directory you download the binary file)", + "checksumAutoCommand": "wget -O- -q -T 1 -t 1 FILEHASHURL | sha256sum -c", + "osDetectionString": "not-to-be-detected" } ] } diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathTest.kt index 6bf2df00..7cd4e536 100644 --- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathTest.kt +++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathTest.kt @@ -101,10 +101,15 @@ class AssetsResourceFeatureReleasePathTest : AssetsPathTest() { return version == 11 && element == OperatingSystem.solaris || version == 12 && element == OperatingSystem.solaris || version == 8 && element == Architecture.arm || + // version == 8 && element == Architecture.riscv64 || + // version == 12 && element == Architecture.riscv64 || version != 8 && element == Architecture.sparcv9 || version == 8 && element == ImageType.testimage || version == 11 && element == ImageType.testimage || version == 12 && element == ImageType.testimage || + + element == Architecture.riscv64 || + element == ImageType.debugimage || element == ImageType.staticlibs } diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceVersionPathTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceVersionPathTest.kt index b5d38b1a..36449ddd 100644 --- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceVersionPathTest.kt +++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceVersionPathTest.kt @@ -68,19 +68,25 @@ class AssetsResourceVersionPathTest : AssetsPathTest() { versionRange.equals(JAVA8_212) && element == Architecture.arm || versionRange.equals(JAVA8_212) && element == HeapSize.large || versionRange.equals(JAVA8_212) && element == ImageType.testimage || + // versionRange.equals(JAVA8_212) && element == Architecture.riscv64 || versionRange.equals(RANGE_8_METADATA) && element == Architecture.aarch64 || versionRange.equals(RANGE_8_METADATA) && element == Architecture.arm || versionRange.equals(RANGE_8_METADATA) && element == ImageType.testimage || + // versionRange.equals(RANGE_8_METADATA) && element == Architecture.riscv64 || versionRange.equals(RANGE_11_12) && element == OperatingSystem.solaris || versionRange.equals(RANGE_11_12) && element == Architecture.sparcv9 || + // versionRange.equals(RANGE_11_12) && element == Architecture.riscv64 || versionRange.equals(JAVA11) && element == Architecture.x32 || versionRange.equals(JAVA11) && element == OperatingSystem.solaris || versionRange.equals(JAVA11) && element == Architecture.sparcv9 || versionRange.equals(JAVA11) && element == ImageType.testimage || versionRange.equals(BELOW_11) && element == ImageType.testimage || + + element == Architecture.riscv64 || + element == ImageType.debugimage || element == ImageType.staticlibs } diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Architecture.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Architecture.kt index 2a69e13c..6b76445e 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Architecture.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Architecture.kt @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonCreator import org.eclipse.microprofile.openapi.annotations.enums.SchemaType import org.eclipse.microprofile.openapi.annotations.media.Schema -@Schema(type = SchemaType.STRING, enumeration = ["x64", "x32", "ppc64", "ppc64le", "s390x", "aarch64", "arm", "sparcv9"]) +@Schema(type = SchemaType.STRING, enumeration = ["x64", "x32", "ppc64", "ppc64le", "s390x", "aarch64", "arm", "sparcv9", "riscv64"]) enum class Architecture : FileNameMatcher { x64, x32("x86-32"), @@ -13,7 +13,9 @@ enum class Architecture : FileNameMatcher { s390x, aarch64, arm("arm32"), - sparcv9; + sparcv9, + riscv64 + ; override lateinit var names: List From 6a5b9a782608660e3c621916407f8cbd8e09f3bb Mon Sep 17 00:00:00 2001 From: Adam Thorpe Date: Thu, 25 Jun 2020 14:17:18 +0100 Subject: [PATCH 2/2] Exclude riscv from test set --- .../adoptopenjdk/api/AssetsResourceFeatureReleasePathTest.kt | 4 +--- .../net/adoptopenjdk/api/AssetsResourceVersionPathTest.kt | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathTest.kt index 7cd4e536..198f89a4 100644 --- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathTest.kt +++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathTest.kt @@ -101,14 +101,12 @@ class AssetsResourceFeatureReleasePathTest : AssetsPathTest() { return version == 11 && element == OperatingSystem.solaris || version == 12 && element == OperatingSystem.solaris || version == 8 && element == Architecture.arm || - // version == 8 && element == Architecture.riscv64 || - // version == 12 && element == Architecture.riscv64 || version != 8 && element == Architecture.sparcv9 || version == 8 && element == ImageType.testimage || version == 11 && element == ImageType.testimage || version == 12 && element == ImageType.testimage || - element == Architecture.riscv64 || + element == Architecture.riscv64 || // Temporary until riscv ga element == ImageType.debugimage || element == ImageType.staticlibs diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceVersionPathTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceVersionPathTest.kt index 36449ddd..a539d1ee 100644 --- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceVersionPathTest.kt +++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceVersionPathTest.kt @@ -68,16 +68,13 @@ class AssetsResourceVersionPathTest : AssetsPathTest() { versionRange.equals(JAVA8_212) && element == Architecture.arm || versionRange.equals(JAVA8_212) && element == HeapSize.large || versionRange.equals(JAVA8_212) && element == ImageType.testimage || - // versionRange.equals(JAVA8_212) && element == Architecture.riscv64 || versionRange.equals(RANGE_8_METADATA) && element == Architecture.aarch64 || versionRange.equals(RANGE_8_METADATA) && element == Architecture.arm || versionRange.equals(RANGE_8_METADATA) && element == ImageType.testimage || - // versionRange.equals(RANGE_8_METADATA) && element == Architecture.riscv64 || versionRange.equals(RANGE_11_12) && element == OperatingSystem.solaris || versionRange.equals(RANGE_11_12) && element == Architecture.sparcv9 || - // versionRange.equals(RANGE_11_12) && element == Architecture.riscv64 || versionRange.equals(JAVA11) && element == Architecture.x32 || versionRange.equals(JAVA11) && element == OperatingSystem.solaris || @@ -85,7 +82,7 @@ class AssetsResourceVersionPathTest : AssetsPathTest() { versionRange.equals(JAVA11) && element == ImageType.testimage || versionRange.equals(BELOW_11) && element == ImageType.testimage || - element == Architecture.riscv64 || + element == Architecture.riscv64 || // Temporary until riscv ga element == ImageType.debugimage || element == ImageType.staticlibs