diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f3ab86d21..40b17cf4d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,7 +41,7 @@ jobs: java: 8 distribution: adopt jobtype: 8 - - os: windows-latest + - os: windows-2019 java: 8 distribution: adopt jobtype: 9 @@ -95,6 +95,9 @@ jobs: with: path: ~/.sbt key: ${{ runner.os }}-sbt-cache-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + - name: Setup Windows C++ toolchain + uses: ilammy/msvc-dev-cmd@v1 + if: ${{ matrix.os == 'windows-2019' }} - name: Build and test (1) if: ${{ matrix.jobtype == 1 }} shell: bash diff --git a/launcher-package/build.sbt b/launcher-package/build.sbt index ddfdb1f9f..aee72cdaf 100755 --- a/launcher-package/build.sbt +++ b/launcher-package/build.sbt @@ -119,7 +119,7 @@ val root = (project in file(".")). file }, // update sbt.sh at root - sbtnVersion := "1.4.7", + sbtnVersion := "1.7.0-RC1", sbtnJarsBaseUrl := "https://github.com/sbt/sbtn-dist/releases/download", sbtnJarsMappings := { val baseUrl = sbtnJarsBaseUrl.value diff --git a/sbt b/sbt index c7c45a3a2..8fdadc5a1 100755 --- a/sbt +++ b/sbt @@ -1,7 +1,7 @@ #!/usr/bin/env bash set +e -declare builtin_sbt_version="1.6.2" +declare builtin_sbt_version="1.7.0-RC1" declare -a residual_args declare -a java_args declare -a scalac_args @@ -24,7 +24,7 @@ declare build_props_sbt_version= declare use_sbtn= declare no_server= declare sbtn_command="$SBTN_CMD" -declare sbtn_version="1.4.7" +declare sbtn_version="1.7.0-RC1" ### ------------------------------- ### ### Helper methods for BASH scripts ###