diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a7212a4..e538910 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,8 +53,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 @@ -104,7 +103,6 @@ jobs: vcpkg install --triplet x64-windows libyaml - name: Check that workflows are up to date - if: '!startsWith(matrix.os, ''windows'')' run: sbt githubWorkflowCheck - name: Check headers and formatting @@ -156,8 +154,7 @@ jobs: runs-on: ${{ matrix.os }} 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 @@ -322,7 +319,7 @@ jobs: dependency-submission: name: Submit Dependencies - if: github.event_name != 'pull_request' + if: github.event.repository.fork == false && github.event_name != 'pull_request' strategy: matrix: os: [ubuntu-latest] @@ -330,8 +327,7 @@ jobs: runs-on: ${{ matrix.os }} 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 @@ -431,8 +427,7 @@ jobs: runs-on: ${{ matrix.os }} 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 @@ -486,7 +481,7 @@ jobs: - name: Publish site if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main' - uses: peaceiris/actions-gh-pages@v3.9.3 + uses: peaceiris/actions-gh-pages@v4.0.0 with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: site/target/docs/site diff --git a/project/plugins.sbt b/project/plugins.sbt index 4cc7b8a..e99d3ed 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ -addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.6.7") -addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.6.7") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.4") +addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.4") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.6.1") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.6") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") diff --git a/workflows.sbt b/workflows.sbt index 7d76a3a..24e864c 100644 --- a/workflows.sbt +++ b/workflows.sbt @@ -57,20 +57,3 @@ ThisBuild / githubWorkflowAddedJobs += WorkflowJob( scalas = Nil, javas = Nil ) - -// NOTE apparently githubWorkflowCheck does not work as intended on windows -// due to file separator differences -ThisBuild / githubWorkflowGeneratedCI ~= { - _.map { job => - if (job.id == "build") - job.copy( - steps = job.steps.map { - case step: WorkflowStep.Run - if step.commands.exists(_ contains "githubWorkflowCheck") => - step.copy(cond = Some("!startsWith(matrix.os, 'windows')")) - case other => other // unchanged - } - ) - else job - } -}