luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Test using JDK 25

This commit is contained in:
Eugene Yokota 2025-09-28 04:27:17 -04:00
parent 51aa789346
commit bd460ae536
5 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/client-test.yml vendored
View File

@ -57,11 +57,13 @@ jobs:
./client/target/bin/sbtn --sbt-script=$(pwd)/sbt about ./client/target/bin/sbtn --sbt-script=$(pwd)/sbt about
./client/target/bin/sbtn --sbt-script=$(pwd)/sbt shutdown ./client/target/bin/sbtn --sbt-script=$(pwd)/sbt shutdown
# test launcher script # test launcher script
echo build using JDK 8 test using JDK 8 and JDK 11 echo build using JDK 8 test using JDK 8 and JDK 25
cd launcher-package cd launcher-package
sbt -Dsbt.build.version=$TEST_SBT_VER rpm:packageBin debian:packageBin sbt -Dsbt.build.version=$TEST_SBT_VER rpm:packageBin debian:packageBin
sbt -Dsbt.build.version=$TEST_SBT_VER integrationTest/test sbt -Dsbt.build.version=$TEST_SBT_VER integrationTest/test
cd citest && ./test.sh cd citest && ./test.sh
JAVA_HOME="$JAVA_HOME_25_X64"
PATH="$JAVA_HOME_25_X64/bin:$PATH"
java -Xmx32m -version java -Xmx32m -version
./test.sh ./test.sh
- name: Client test (macOS) - name: Client test (macOS)
@ -86,11 +88,10 @@ jobs:
./client/target/bin/sbtn --sbt-script=$(pwd)/launcher-package/src/universal/bin/sbt.bat about ./client/target/bin/sbtn --sbt-script=$(pwd)/launcher-package/src/universal/bin/sbt.bat about
./client/target/bin/sbtn --sbt-script=$(pwd)/launcher-package/src/universal/bin/sbt.bat shutdown ./client/target/bin/sbtn --sbt-script=$(pwd)/launcher-package/src/universal/bin/sbt.bat shutdown
# test launcher script # test launcher script
echo build using JDK 8, test using JDK 8, on Windows echo build using JDK 8 test using JDK 8 and JDK 25
cd launcher-package cd launcher-package
bin/coursier.bat resolve bin/coursier.bat resolve
sbt -Dsbt.build.version=$TEST_SBT_VER integrationTest/test sbt -Dsbt.build.version=$TEST_SBT_VER integrationTest/test
cd citest cd citest
./test.bat ./test.bat
java -Xmx32m -version
test3/test3.bat test3/test3.bat

2
launcher-package/citest/test3/.jvmopts
View File

@ -1,3 +1,3 @@
-XX:+CMSClassUnloadingEnabled #-XX:+CMSClassUnloadingEnabled
#-XX:ReservedCodeCacheSize=192m #-XX:ReservedCodeCacheSize=192m
#-Duser.timezone=GMT #-Duser.timezone=GMT

6
launcher-package/citest/test3/build.sbt
View File

@ -27,19 +27,19 @@ lazy val root = (project in file("."))
assert(ys.size == 1, s"ys has more than one item: $ys") assert(ys.size == 1, s"ys has more than one item: $ys")
assert(ys(0) startsWith "Java HotSpot(TM) 64-Bit Server VM warning") assert(ys(0) startsWith "Java HotSpot(TM) 64-Bit Server VM warning")
}, },
checkNumericVersion = { checkNumericVersion := {
val xs = IO.readLines(file("numericVersion.txt")).toVector val xs = IO.readLines(file("numericVersion.txt")).toVector
val expectedVersion = "^"+versionRegEx+"$" val expectedVersion = "^"+versionRegEx+"$"
assert(xs(0).matches(expectedVersion)) assert(xs(0).matches(expectedVersion))
}, },
checkScriptVersion = { checkScriptVersion := {
val xs = IO.readLines(file("scriptVersion.txt")).toVector val xs = IO.readLines(file("scriptVersion.txt")).toVector
val expectedVersion = "^"+versionRegEx+"$" val expectedVersion = "^"+versionRegEx+"$"
assert(xs(0).matches(expectedVersion)) assert(xs(0).matches(expectedVersion))
}, },
checkVersion = { checkVersion := {
val out = IO.readLines(file("version.txt")).toVector.mkString("\n") val out = IO.readLines(file("version.txt")).toVector.mkString("\n")
val expectedVersion = val expectedVersion =

10
launcher-package/citest/test3/test3.bat
View File

@ -2,16 +2,18 @@
SETLOCAL SETLOCAL
SET JAVA_HOME=C:\jdk11 SET JAVA_HOME=%JAVA_HOME_25_X64%
SET PATH=C:\jdk11\bin;%PATH% SET PATH=%JAVA_HOME_25_X64%\bin;%PATH%
SET SBT_OPTS=-Xmx4g -Dfile.encoding=UTF8 SET SBT_OPTS=-Xmx4g -Dfile.encoding=UTF8
SET BASE_DIR=%CD% SET BASE_DIR=%CD%
SET SCRIPT_DIR=%~dp0 SET SCRIPT_DIR=%~dp0
CD %SCRIPT_DIR% CD %SCRIPT_DIR%
"%BASE_DIR%freshly-baked\sbt\bin\sbt" about 1> output.txt 2> err.txt "%BASE_DIR%\freshly-baked\sbt\bin\sbt" about 1> output.txt 2> err.txt
"%BASE_DIR%freshly-baked\sbt\bin\sbt" check "%BASE_DIR%\freshly-baked\sbt\bin\sbt" check
CD %BASE_DIR% CD %BASE_DIR%
ENDLOCAL ENDLOCAL
IF %errorlevel% NEQ 0 EXIT /b %errorlevel%

3
launcher-package/src/universal/bin/sbt.bat
View File

@ -688,8 +688,7 @@ if defined sbt_args_no_server (
if not defined sbt_args_no_hide_jdk_warnings ( if not defined sbt_args_no_hide_jdk_warnings (
if /I !JAVA_VERSION! EQU 25 ( if /I !JAVA_VERSION! EQU 25 (
call :addJava --sun-misc-unsafe-memory-access=allow set _SBT_OPTS=--sun-misc-unsafe-memory-access=allow --enable-native-access=ALL-UNNAMED !_SBT_OPTS!
call :addJava --enable-native-access=ALL-UNNAMED
) )
) )