Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: test on more JDKs #291

Merged
merged 10 commits into from
Jul 23, 2021
Merged

CI: test on more JDKs #291

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1812ba2
CI: enable OpenJDK 12
vhotspur Jul 2, 2021
aa6aed7
CI: enable OpenJDK 13
vhotspur Jul 2, 2021
cce4990
CI: enable OpenJDK 14
vhotspur Jul 2, 2021
42934e3
CI: enable OpenJDK 15
vhotspur Jul 20, 2021
55f9afb
CI: build on 13 and 15 in Windows
vhotspur Jul 20, 2021
f0356ae
CI: build on 13 and 15 in Mac
vhotspur Jul 20, 2021
3caac4a
CI: enable OpenJDK 16
vhotspur Jul 21, 2021
0e7f89f
CI: add workaround for Java 16
vhotspur Jul 22, 2021
1e1c63e
CI: run on OpenJ9 on JDK16
vhotspur Jul 22, 2021
84d7091
CI: parse java -version only
vhotspur Jul 22, 2021
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
12 changes: 8 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,14 @@ jobs:
- openjdk9
- openjdk10
- openjdk11
#- openjdk12
- openjdk12
- openjdk13
- openjdk14
- openjdk15
- openjdk16
- openj9-openjdk8
- openj9-openjdk11
#- openj9-openjdk16
- openj9-openjdk16
runs-on: ubuntu-latest
container: "renaissancebench/buildenv:${{ matrix.image }}"
continue-on-error: true
Expand Down Expand Up @@ -101,7 +105,7 @@ jobs:
macos:
strategy:
matrix:
java: [ '8', '11' ] #, '13', '15' ]
java: [ '8', '11', '13', '15' ]
runs-on: macos-latest
continue-on-error: true
steps:
Expand Down Expand Up @@ -150,7 +154,7 @@ jobs:
windows:
strategy:
matrix:
java: [ '8', '11' ] #, '13', '15' ]
java: [ '8', '11' , '13', '15' ]
runs-on: windows-latest
continue-on-error: true
steps:
Expand Down
1 change: 1 addition & 0 deletions tools/ci/bench-jmh.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ source "$(dirname "$0")/common.sh"

java -jar "$RENAISSANCE_JMH_JAR" \
-jvmArgs -Xms2500M -jvmArgs -Xmx2500m \
$( for arg in $( get_jvm_workaround_args ); do echo "-jvmArgs" "$arg"; done ) \
lbulej marked this conversation as resolved.
Show resolved Hide resolved
-jvmArgs -Dorg.renaissance.jmh.configuration=test \
-jvmArgs -Dorg.renaissance.jmh.fakeIncompatible=true \
-wi 0 -i 1 -f 1 -foe true
15 changes: 15 additions & 0 deletions tools/ci/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ RENAISSANCE_GIT_VERSION=$(git describe --tags --always --dirty=-SNAPSHOT || echo
# Strip leading 'v' from the git-produced version
RENAISSANCE_VERSION=${RENAISSANCE_GIT_VERSION#v}

# Try to guess JVM version
RENAISSANCE_JVM_MAJOR_VERSION="$( java -XshowSettings:properties -version 2>&1 \
| sed -n -e 's#^[ \t]*java.version[ ]*=[ ]\(.*\)#\1#p' \
lbulej marked this conversation as resolved.
Show resolved Hide resolved
| sed -e 's#1\.8#8#' -e 's#\([^.]*\).*#\1#' \
|| echo 8 )"

# The base bundle
RENAISSANCE_DIR="target"
RENAISSANCE_JAR_NAME="renaissance-gpl-${RENAISSANCE_VERSION}.jar"
Expand All @@ -43,6 +49,15 @@ cp_reflink() {
cp $REFLINK "$@"
}

get_jvm_workaround_args() {
if [ "$RENAISSANCE_JVM_MAJOR_VERSION" = "16" ]; then
echo "--add-opens=java.base/java.lang.invoke=ALL-UNNAMED"
echo "--add-opens=java.base/java.util=ALL-UNNAMED"
echo "--add-opens=java.base/java.nio=ALL-UNNAMED"
echo "--add-opens=java.base/sun.nio.ch=ALL-UNNAMED"
fi
}


# Make sure we are in the top-level directory so that we can use
# relative paths when referring to files within the project.
Expand Down