Skip to content

Commit

Permalink
Add the JVM Implementation after the name of the Vendor (#140)
Browse files Browse the repository at this point in the history
* To fix #46 and #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
  • Loading branch information
delgurth authored Apr 6, 2021
1 parent 0010d1f commit 150e793
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
17 changes: 17 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion update_data.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 150e793

Please sign in to comment.