Skip to content
This repository was archived by the owner on Oct 14, 2021. It is now read-only.

Add riscv architecture to api #229

Merged
merged 2 commits into from
Jun 25, 2020
Merged

Add riscv architecture to api #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55e6f20
WIP add riscv64
Jun 25, 2020
6a5b9a7
Exclude riscv from test set
Jun 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions adoptopenjdk-api-v3-frontend/src/main/resources/JSON/platforms.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wasn't sure what this file does/should be

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure this is even used anymore, probably fine

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is used in the images on the website when we display hero cards

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah it's unused

"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"
}
]
}
3 changes: 3 additions & 0 deletions ...-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,9 @@ class AssetsResourceFeatureReleasePathTest : AssetsPathTest() {
version == 8 && element == ImageType.testimage ||
version == 11 && element == ImageType.testimage ||
version == 12 && element == ImageType.testimage ||

element == Architecture.riscv64 || // Temporary until riscv ga

element == ImageType.debugimage ||
element == ImageType.staticlibs
}
Expand Down
3 changes: 3 additions & 0 deletions ...jdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceVersionPathTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ class AssetsResourceVersionPathTest : AssetsPathTest() {
versionRange.equals(JAVA11) && element == Architecture.sparcv9 ||
versionRange.equals(JAVA11) && element == ImageType.testimage ||
versionRange.equals(BELOW_11) && element == ImageType.testimage ||

element == Architecture.riscv64 || // Temporary until riscv ga

element == ImageType.debugimage ||
element == ImageType.staticlibs
}
Expand Down
6 changes: 4 additions & 2 deletions adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Architecture.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand All @@ -13,7 +13,9 @@ enum class Architecture : FileNameMatcher {
s390x,
aarch64,
arm("arm32"),
sparcv9;
sparcv9,
riscv64
;

override lateinit var names: List<String>

Expand Down