Fixes Debian 11 compat

Fixes https://github.com/sbt/sbt/issues/7118

Problem
-------
sbtn 1.8.1 was built using ubuntu-latest, which meant picking up newer
glibc.

Solution
--------
This downgraded the ubuntu machine to build sbtn.
This commit is contained in:
Eugene Yokota 2023-01-04 17:18:17 -05:00
parent 3257a48f3e
commit b0b7705739
4 changed files with 4 additions and 4 deletions

View File

@ -12,7 +12,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
include: include:
- os: ubuntu-latest - os: ubuntu-20.04
java: 17 java: 17
distribution: temurin distribution: temurin
jobtype: 1 jobtype: 1

View File

@ -121,7 +121,7 @@ val root = (project in file(".")).
file file
}, },
// update sbt.sh at root // update sbt.sh at root
sbtnVersion := "1.8.1", sbtnVersion := "1.8.2",
sbtnJarsBaseUrl := "https://github.com/sbt/sbtn-dist/releases/download", sbtnJarsBaseUrl := "https://github.com/sbt/sbtn-dist/releases/download",
sbtnJarsMappings := { sbtnJarsMappings := {
val baseUrl = sbtnJarsBaseUrl.value val baseUrl = sbtnJarsBaseUrl.value

View File

@ -37,7 +37,7 @@ class InstallSbtnSpec extends AnyFlatSpec {
"InstallSbtn" should "extract native sbtn" ignore "InstallSbtn" should "extract native sbtn" ignore
withTemp(".zip") { tmp => withTemp(".zip") { tmp =>
withTemp(".exe") { sbtn => withTemp(".exe") { sbtn =>
InstallSbtn.extractSbtn(term, "1.8.1", tmp, sbtn) InstallSbtn.extractSbtn(term, "1.8.2", tmp, sbtn)
val tmpDir = Files.createTempDirectory("sbtn-test").toRealPath() val tmpDir = Files.createTempDirectory("sbtn-test").toRealPath()
Files.createDirectories(tmpDir.resolve("project")) Files.createDirectories(tmpDir.resolve("project"))
val foo = tmpDir.resolve("foo") val foo = tmpDir.resolve("foo")

2
sbt
View File

@ -24,7 +24,7 @@ declare build_props_sbt_version=
declare use_sbtn= declare use_sbtn=
declare no_server= declare no_server=
declare sbtn_command="$SBTN_CMD" declare sbtn_command="$SBTN_CMD"
declare sbtn_version="1.8.1" declare sbtn_version="1.8.2"
### ------------------------------- ### ### ------------------------------- ###
### Helper methods for BASH scripts ### ### Helper methods for BASH scripts ###