diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9c13c29b..1ee747fd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,8 +34,7 @@ jobs: timeout-minutes: 60 steps: - name: Install sbt - if: contains(runner.os, 'macos') - run: brew install sbt + uses: sbt/setup-sbt@v1 - name: Checkout current branch (full) uses: actions/checkout@v4 @@ -51,13 +50,13 @@ jobs: java-version: 17 cache: sbt - - name: Install sbt - TEMPORARY! - uses: sbt/setup-sbt@v1 - - name: sbt update if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' run: sbt +update + - name: Check that workflows are up to date + run: sbt githubWorkflowCheck + - name: Check headers and formatting if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest' run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck lucumaScalafmtCheck lucumaScalafixCheck @@ -97,9 +96,6 @@ jobs: java-version: 17 cache: sbt - - name: Install sbt - TEMPORARY! - uses: sbt/setup-sbt@v1 - - name: sbt update if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' run: sbt +update