github/asdf-java
github/asdf-java
3
0
Fork 0
mirror of https://github.com/halcyon/asdf-java.git synced 2024-10-06 07:42:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add the JVM Implementation after the name of the Vendor (#140)

Browse Source 
* To fix https://github.com/halcyon/asdf-java/issues/46 and https://github.com/halcyon/asdf-java/issues/57 added the jvm_impl after the vendor if it's not the hotspot jvm

* Only openj9 is special case, hotspot and graalvm should be ignored

* Suppress grep output, but show message about what is found. In case the test fails this helps to see what part broke.

* Added testcase for the graalvm-graalvm I accidentally introduced, so this won't happen in the future
This commit is contained in:
Wessel van Norel 2021-04-06 22:14:33 +02:00 committed by GitHub
parent 0010d1f98d
commit 150e793d43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.github/workflows/tests.yml vendored
View File

@ -36,6 +36,23 @@ jobs:
run: |
. asdf/asdf.sh
asdf plugin-test java "$GITHUB_WORKSPACE" --asdf-plugin-gitref "$GITHUB_SHA" --asdf-tool-version adoptopenjdk-8.0.252+9.1.openj9-0.20.0 java -version
- name: Check update_data.bash
env:
GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
./update_data.bash
grep -q adoptopenjdk-openj9-11 data/jdk-linux-x86_64.tsv
echo "Found adoptopenjdk-openj9-11"
grep -q adoptopenjdk-openj9-large_heap-11 data/jdk-macosx-x86_64.tsv
echo "Found adoptopenjdk-openj9-large_heap-11"
grep -q zulu-musl-11 data/jdk-linux-x86_64.tsv
echo "Found zulu-musl-11 "
grep -q liberica-javafx-16 data/jdk-linux-arm32-vfp-hflt.tsv
echo "Found liberica-javafx-16"
grep -q liberica-lite-11 data/jdk-macosx-x86_64.tsv
echo "Found liberica-lite-11"
grep "graalvm-21" data/jdk-linux-aarch64.tsv | grep -q -v "graalvm-graalvm-21"
echo "Found graalvm-21"
- name: macOS Check java_home integration
env:
GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}

2
update_data.bash
View File

@ -45,7 +45,7 @@ done
RELEASE_QUERY='.[]
| select(.file_type | IN("tar.gz", "zip"))
| .["features"] = (.features | map(select(IN("musl", "javafx", "lite", "large_heap"))))
| [([.vendor, if ((.features | length) == 0) then empty else (.features | join("-")) end, .version] | join("-")), .filename, .url, .sha256]
| [([.vendor, if (.jvm_impl == "openj9") then .jvm_impl else empty end, if ((.features | length) == 0) then empty else (.features | join("-")) end, .version] | join("-")), .filename, .url, .sha256]
| @tsv'
for FILE in "${DATA_DIR}"/*.json
do