Skip to content

Commit 35dff76

Browse files
Backport "chore: use sbt/setup-sbt when using ubuntu-latest image" to 3.6 (#22277)
Backports #22227 to the 3.6.3. PR submitted by the release tooling. [skip ci]
2 parents 556e916 + 9530960 commit 35dff76

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

.github/workflows/build-sdk.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ jobs:
6161
distribution: temurin
6262
java-version: ${{ inputs.java-version }}
6363
cache : sbt
64+
- uses: sbt/setup-sbt@v1
6465
- name: Build and pack the SDK (universal)
6566
run : ./project/scripts/sbt dist/Universal/stage
6667
- name: Build and pack the SDK (linux x86-64)

.github/workflows/language-reference.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
distribution: 'temurin'
3737
java-version: 17
3838
cache: 'sbt'
39+
- uses: sbt/setup-sbt@v1
3940

4041
- name: Generate reference documentation and test links
4142
run: |

.github/workflows/launchers.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
java-version: '17'
2121
distribution: 'temurin'
2222
cache: 'sbt'
23+
- uses: sbt/setup-sbt@v1
2324
- name: Build and test launcher command
2425
run: ./project/scripts/native-integration/bashTests
2526
env:
@@ -37,9 +38,7 @@ jobs:
3738
java-version: '17'
3839
distribution: 'temurin'
3940
cache: 'sbt'
40-
# https://github.com/actions/runner-images/issues/9369
41-
- name: Install sbt
42-
run: brew install sbt
41+
- uses: sbt/setup-sbt@v1
4342
- name: Build and test launcher command
4443
run: ./project/scripts/native-integration/bashTests
4544
env:
@@ -58,9 +57,7 @@ jobs:
5857
java-version: '17'
5958
distribution: 'temurin'
6059
cache: 'sbt'
61-
# https://github.com/actions/runner-images/issues/9369
62-
- name: Install sbt
63-
run: brew install sbt
60+
- uses: sbt/setup-sbt@v1
6461
- name: Build and test launcher command
6562
run: ./project/scripts/native-integration/bashTests
6663
env:
@@ -79,9 +76,7 @@ jobs:
7976
java-version: '17'
8077
distribution: 'temurin'
8178
cache: 'sbt'
82-
# https://github.com/actions/runner-images/issues/9369
83-
- name: Install sbt
84-
run: brew install sbt
79+
- uses: sbt/setup-sbt@v1
8580
- name: Build and test launcher command
8681
run: ./project/scripts/native-integration/bashTests
8782
env:
@@ -100,6 +95,7 @@ jobs:
10095
java-version: '17'
10196
distribution: 'temurin'
10297
cache: 'sbt'
98+
- uses: sbt/setup-sbt@v1
10399
- name: Build the launcher command
104100
run: sbt "dist-win-x86_64/Universal/stage"
105101
- name: Run the launcher command tests

.github/workflows/scaladoc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
java-version: 17
3838
cache: 'sbt'
3939

40+
- uses: sbt/setup-sbt@v1
4041
- name: Compile and test scala3doc-js
4142
run: ./project/scripts/sbt scaladoc-js-main/test
4243

0 commit comments

Comments
 (0)