Skip to content
Merged
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions jni/scala_partest_natives.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ rm -rf $sub
mkdir $sub
pushd $sub
sbtv=1.11.4
scalav=2.13.16
scalav=2.13.18
wget https://github.com/sbt/sbt/releases/download/v$sbtv/sbt-$sbtv.tgz
tar -xf sbt-$sbtv.tgz
git clone https://github.com/judovana/scala.git scala-$scalav
Copy link
Collaborator

Choose a reason for hiding this comment

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

Just for record, the chnages in that fork were all emrged to usptream.

wget -O scala-$scalav.tar.gz https://github.com/scala/scala/archive/refs/tags/v$scalav.tar.gz
Copy link
Collaborator

Choose a reason for hiding this comment

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

My trust to wget is already zero... Would much rather stay on clone

tar -xf scala-$scalav.tar.gz
pushd scala-$scalav
git checkout jdk11AndUpNatives
mach_file=./test/files/jvm/natives.check
if $JAVA_HOME/bin/java -version 2>&1 | grep Picked ; then
orig_mach_file_content=`cat ./test/files/jvm/natives.check`
Expand Down
Loading