Skip to content

Commit

Permalink
Merge pull request #156 from hnaderi/update/sbt-typelevel-0.7.4
Browse files Browse the repository at this point in the history
Update sbt-typelevel, sbt-typelevel-site to 0.7.4
  • Loading branch information
mergify[bot] authored Dec 11, 2024
2 parents 666a892 + 9f48de2 commit 8cae4d7
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 30 deletions.
17 changes: 6 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -322,16 +319,15 @@ 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]
java: [temurin@11]
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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
17 changes: 0 additions & 17 deletions workflows.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

0 comments on commit 8cae4d7

Please sign in to comment.