Skip to content

Commit fd0bca8

Browse files
committed
Fix CI version capture
1 parent 5cb3b25 commit fd0bca8

2 files changed

Lines changed: 8 additions & 3 deletions

File tree

.github/workflows/ci.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,11 @@ jobs:
140140
- uses: DeterminateSystems/magic-nix-cache-action@v13
141141

142142
- run: |
143-
nix develop .#jdk${{ matrix.java }} --command sbt cli/pack publishM2 publishLocal
144-
SCIP_JAVA_VERSION="$(nix develop .#jdk${{ matrix.java }} --command sbt --error 'print cli/version')"
143+
sbt_output="$(mktemp)"
144+
nix develop .#jdk${{ matrix.java }} --command \
145+
sbt --error cli/pack publishM2 publishLocal 'print cli/version' | tee "$sbt_output"
146+
SCIP_JAVA_VERSION="$(awk 'NF { value = $0 } END { print value }' "$sbt_output")"
147+
test -n "$SCIP_JAVA_VERSION"
145148
printf 'SCIP_JAVA_VERSION=%s\n' "$SCIP_JAVA_VERSION" >> "$GITHUB_ENV"
146149
printf 'SCIP_JAVA_CLI=%s\n' "$PWD/scip-java/target/pack/bin/scip-java" >> "$GITHUB_ENV"
147150

build.sbt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ inThisBuild(
2727
PB.protocVersion := V.protobuf,
2828
autoScalaLibrary := false,
2929
crossPaths := false,
30-
// Pin bytecode to major 55 so sbt-assembly's older ASM can shade it.
30+
// Pin bytecode to major 55 so compiler plugins can run on Java 11.
3131
Compile / javacOptions ++= Seq("--release", "11"),
3232
incOptions ~= { old =>
3333
old.withEnabled(false).withApiDebug(true)
@@ -427,6 +427,8 @@ lazy val minimized = project
427427
// Fork javac so it receives real file paths instead of sbt's `vf://` virtual-file URIs
428428
// (see the comment on `scipKotlincMinimized` for the long story).
429429
javaHome := Some(file(System.getProperty("java.home"))),
430+
// Keep minimized snapshots stable across JDK 11/17/21.
431+
Compile / javacOptions ++= Seq("--release", "11"),
430432
Compile / javacOptions ++= javacModuleOptions,
431433
javacOptions +=
432434
List(

0 commit comments

Comments
 (0)