Skip to content

Commit

Permalink
Merge pull request #669 from scala-steward-org/fix/ensure-sbt-is-inst…
Browse files Browse the repository at this point in the history
…alled

Ensure SBT is installed using Coursier
  • Loading branch information
alejandrohdezma authored Jan 4, 2025
2 parents 107142e + dbefdd4 commit b2ce4e0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
8 changes: 0 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ jobs:
runs-on: ubuntu-latest
name: Scala Steward
steps:
- name: Install sbt
uses: sbt/setup-sbt@v1
- name: Scala Steward
uses: scala-steward-org/scala-steward-action@v2
```
Expand Down Expand Up @@ -134,8 +132,6 @@ jobs:
runs-on: ubuntu-latest
name: Launch Scala Steward
steps:
- name: Install sbt
uses: sbt/setup-sbt@v1
- name: Launch Scala Steward
uses: scala-steward-org/scala-steward-action@v2
with:
Expand Down Expand Up @@ -333,8 +329,6 @@ You can manually trigger workflow runs using the [workflow_dispatch](https://doc
runs-on: ubuntu-latest
name: Launch Scala Steward
steps:
- name: Install sbt
uses: sbt/setup-sbt@v1
- name: Launch Scala Steward
uses: scala-steward-org/scala-steward-action@v2
with:
Expand Down Expand Up @@ -392,8 +386,6 @@ When using the `github-app-*` inputs, Scala Steward will always retrieve the lis
runs-on: ubuntu-latest
name: Launch Scala Steward
steps:
- name: Install sbt
uses: sbt/setup-sbt@v1
- name: Launch Scala Steward
uses: scala-steward-org/scala-steward-action@v2
with:
Expand Down
6 changes: 4 additions & 2 deletions src/modules/coursier.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {type NonEmptyString} from '../core/types'
* Installs `coursier` and add its executable to the `PATH`.
*
* Once coursier is installed, installs `scalafmt`
* `scalafix` and `scala-cli` tools.
* `scalafix`, `sbt` and `scala-cli` tools.
*
* Throws error if the installation fails.
*/
Expand All @@ -32,7 +32,7 @@ export async function install(): Promise<void> {

await exec.exec(
'cs',
['install', 'scalafmt', 'scalafix', 'scala-cli', '--install-dir', binary],
['install', 'scalafmt', 'scalafix', 'scala-cli', 'sbt', '--install-dir', binary],
{
silent: true,
listeners: {stdline: core.debug, errline: core.debug},
Expand All @@ -51,6 +51,8 @@ export async function install(): Promise<void> {

core.info(`✓ Scalafix installed, version: ${scalafixVersion.trim()}`)

core.info('✓ SBT installed')

core.info('✓ scala-cli installed')
} catch (error: unknown) {
core.debug((error as Error).message)
Expand Down

0 comments on commit b2ce4e0

Please sign in to comment.