chore: use sbt/setup-sbt when using ubuntu-latest image (#22227)

Closes #22224
scala · Dec 17, 2024 · 77376fe · 77376fe
2 parents 3f184c7 + 4961d1e
commit 77376fe
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/build-sdk.yml b/.github/workflows/build-sdk.yml
@@ -61,6 +61,7 @@ jobs:
           distribution: temurin
           java-version: ${{ inputs.java-version }}
           cache       : sbt
+      - uses: sbt/setup-sbt@v1
       - name: Build and pack the SDK (universal)
         run : ./project/scripts/sbt dist/Universal/stage
       - name: Build and pack the SDK (linux x86-64)

diff --git a/.github/workflows/language-reference.yaml b/.github/workflows/language-reference.yaml
@@ -36,6 +36,7 @@ jobs:
           distribution: 'temurin'
           java-version: 17
           cache: 'sbt'
+      - uses: sbt/setup-sbt@v1
 
       - name: Generate reference documentation and test links
         run: |

diff --git a/.github/workflows/launchers.yml b/.github/workflows/launchers.yml
@@ -20,6 +20,7 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
           cache: 'sbt'
+      - uses: sbt/setup-sbt@v1
       - name: Build and test launcher command
         run: ./project/scripts/native-integration/bashTests
         env:
@@ -37,9 +38,7 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
           cache: 'sbt'
-      # https://github.com/actions/runner-images/issues/9369
-      - name: Install sbt
-        run: brew install sbt
+      - uses: sbt/setup-sbt@v1
       - name: Build and test launcher command
         run: ./project/scripts/native-integration/bashTests
         env:
@@ -58,9 +57,7 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
           cache: 'sbt'
-      # https://github.com/actions/runner-images/issues/9369
-      - name: Install sbt
-        run: brew install sbt
+      - uses: sbt/setup-sbt@v1
       - name: Build and test launcher command
         run: ./project/scripts/native-integration/bashTests
         env:
@@ -79,9 +76,7 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
           cache: 'sbt'
-      # https://github.com/actions/runner-images/issues/9369
-      - name: Install sbt
-        run: brew install sbt
+      - uses: sbt/setup-sbt@v1
       - name: Build and test launcher command
         run: ./project/scripts/native-integration/bashTests
         env:
@@ -100,6 +95,7 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
           cache: 'sbt'
+      - uses: sbt/setup-sbt@v1
       - name: Build the launcher command
         run: sbt "dist-win-x86_64/Universal/stage"
       - name: Run the launcher command tests

diff --git a/.github/workflows/scaladoc.yaml b/.github/workflows/scaladoc.yaml
@@ -37,6 +37,7 @@ jobs:
           java-version: 17
           cache: 'sbt'
 
+      - uses: sbt/setup-sbt@v1
       - name: Compile and test scala3doc-js
         run: ./project/scripts/sbt scaladoc-js-main/test
 

diff --git a/.github/workflows/test-cc.yml b/.github/workflows/test-cc.yml
@@ -26,5 +26,6 @@ jobs:
     steps:
       - name: Git Checkout
         uses: actions/checkout@v4
+      - uses: sbt/setup-sbt@v1
       - name: Test with Scala 2 library with CC TASTy
         run: ./project/scripts/sbt ";set ThisBuild/Build.scala2Library := Build.Scala2LibraryCCTasty ;scala3-bootstrapped/test"