From b0b770573989739367112a43f7ad4e20ae6c5223 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Wed, 4 Jan 2023 17:18:17 -0500 Subject: [PATCH] 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. --- .github/workflows/ci.yml | 2 +- launcher-package/build.sbt | 2 +- main/src/test/scala/sbt/internal/InstallSbtnSpec.scala | 2 +- sbt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5d302c00f..0f268cc16 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false matrix: include: - - os: ubuntu-latest + - os: ubuntu-20.04 java: 17 distribution: temurin jobtype: 1 diff --git a/launcher-package/build.sbt b/launcher-package/build.sbt index 60ff78f3b..91a75b44e 100755 --- a/launcher-package/build.sbt +++ b/launcher-package/build.sbt @@ -121,7 +121,7 @@ val root = (project in file(".")). file }, // update sbt.sh at root - sbtnVersion := "1.8.1", + sbtnVersion := "1.8.2", sbtnJarsBaseUrl := "https://github.com/sbt/sbtn-dist/releases/download", sbtnJarsMappings := { val baseUrl = sbtnJarsBaseUrl.value diff --git a/main/src/test/scala/sbt/internal/InstallSbtnSpec.scala b/main/src/test/scala/sbt/internal/InstallSbtnSpec.scala index 412341810..c94f1b7ea 100644 --- a/main/src/test/scala/sbt/internal/InstallSbtnSpec.scala +++ b/main/src/test/scala/sbt/internal/InstallSbtnSpec.scala @@ -37,7 +37,7 @@ class InstallSbtnSpec extends AnyFlatSpec { "InstallSbtn" should "extract native sbtn" ignore withTemp(".zip") { tmp => 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() Files.createDirectories(tmpDir.resolve("project")) val foo = tmpDir.resolve("foo") diff --git a/sbt b/sbt index f9b0fcc4c..e9b228cf6 100755 --- a/sbt +++ b/sbt @@ -24,7 +24,7 @@ declare build_props_sbt_version= declare use_sbtn= declare no_server= declare sbtn_command="$SBTN_CMD" -declare sbtn_version="1.8.1" +declare sbtn_version="1.8.2" ### ------------------------------- ### ### Helper methods for BASH scripts ###