Skip to content

Commit

Permalink
Tiny improvements to the build
Browse files Browse the repository at this point in the history
* tell `actions/checkout` to fetch tags (instead of a 2nd `git fetch` invocation)
* use `sbt/setup-sbt` to be sure `sbt` is present
* remove no longer needed plugin `sbt-vspp` (see https://github.com/esbeetee/sbt-vspp)
* simplify CI detection in `build.sbt`
  • Loading branch information
mzuehlke authored and kitbellew committed Oct 18, 2024
1 parent b85fe2a commit 0c51ecc
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-tags: true
- name: Set up JVM
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}
cache: 'sbt'

- run: git fetch --tags -f
- uses: sbt/setup-sbt@v1
- run:
# for git tests
git config --global user.email "[email protected]" && git config --global user.name "scalafmt"
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ inThisBuild(List(
),
resolvers ++= Resolver.sonatypeOssRepos("public"),
scalaVersion := "2.12.20",
packageDoc / publishArtifact := sys.env.contains("CI"),
packageSrc / publishArtifact := sys.env.contains("CI"),
packageDoc / publishArtifact := insideCI.value,
packageSrc / publishArtifact := insideCI.value,
))
publish / skip := true

Expand Down
1 change: 0 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.8.0")
libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value
addSbtPlugin("com.scalawilliam.esbeetee" % "sbt-vspp" % "0.4.13")

0 comments on commit 0c51ecc

Please sign in to comment.