Skip to content
Merged
Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions .github/workflows/release-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Set up environment variables
run: |
echo "VERSION=$(cat sjsonnet/version)" >> $GITHUB_ENV
echo "SCALA_VERSION=3.3.6" >> $GITHUB_ENV
echo "SCALA_VERSION=3.3.7" >> $GITHUB_ENV
- name: JAR Build
run: ./mill "sjsonnet.jvm[$SCALA_VERSION].__.assembly"
- name: JS Build
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
- name: Set up environment variables
run: |
echo "VERSION=$(cat sjsonnet/version)" >> $GITHUB_ENV
echo "SCALA_VERSION=3.3.6" >> $GITHUB_ENV
echo "SCALA_VERSION=3.3.7" >> $GITHUB_ENV
- name: Native Binary Build
run: ./mill "sjsonnet.native[$SCALA_VERSION].nativeLink"
- name: GraalVM Binary Build
Expand Down
5 changes: 4 additions & 1 deletion build.mill
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,10 @@ object bench extends ScalaModule with JmhModule with ScalafmtModule {
mainClass = "org.openjdk.jmh.Main",
classPath = (runClasspath() ++ generatorDeps()).map(_.path) ++
Seq(jmhGeneratedSources().path, resources.path),
mainArgs = Array("sjsonnet.bench.RegressionBenchmark.main" ,s"-p=path=${regressionCases.mkString(",")}"),
mainArgs = Array(
"sjsonnet.bench.RegressionBenchmark.main",
s"-p=path=${regressionCases.mkString(",")}"
),
cwd = Task.ctx().dest,
javaHome = javaHome().map(_.path),
jvmArgs = forkedArgs,
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cancelable in Global := true
val options = Seq("-Wconf:origin=scala.collection.compat.*:s", "-Xlint:all")

lazy val commonSettings = Seq(
scalaVersion := "3.3.6",
scalaVersion := "3.3.7",
scalacOptions ++= options
)

Expand Down
4 changes: 2 additions & 2 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -248,13 +248,13 @@ mitigate the unfortunate JVM warmup overhead that adds ~1s to every invocation
down to 0.2-0.3s. For the simple non-client-server executable, you can use

```bash
./mill -i show sjsonnet[3.3.6].jvm.assembly
./mill -i show sjsonnet[3.3.7].jvm.assembly
```

To create the executable. For the client-server executable, you can use

```bash
./mill -i show sjsonnet[3.3.6].server.assembly
./mill -i show sjsonnet[3.3.7].server.assembly
```

By default, the Sjsonnet background server lives in `~/.sjsonnet`, and lasts 5
Expand Down
2 changes: 1 addition & 1 deletion sjsonnet/test/resources/go_test_suite/refresh_golden.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set -e

JAVA_OPTS="-Xss100m -Xms2g -XX:+UseG1GC"
ROOTDIR=$(git rev-parse --show-toplevel)
JSONNET_BIN="$ROOTDIR/out/sjsonnet/jvm/3.3.6/assembly.dest/out.jar"
JSONNET_BIN="$ROOTDIR/out/sjsonnet/jvm/3.3.7/assembly.dest/out.jar"
PARAMS="--no-duplicate-keys-in-comprehension --strict-import-syntax --strict-inherited-assertions --strict-set-operations"

if [ $# -eq 0 ] ; then
Expand Down
2 changes: 1 addition & 1 deletion sjsonnet/test/resources/test_suite/refresh_golden.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
set -e

JAVA_OPTS="-Xss100m"
JSONNET_BIN="../../../../out/sjsonnet/jvm/3.3.6/assembly.dest/out.jar"
JSONNET_BIN="../../../../out/sjsonnet/jvm/3.3.7/assembly.dest/out.jar"
PARAMS="--no-duplicate-keys-in-comprehension --strict-import-syntax --strict-inherited-assertions --strict-set-operations"

if [ $# -eq 0 ] ; then
Expand Down