diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 541a99df3..5018a856b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,12 +1,13 @@ name: CI + on: - push: - branches: - - master pull_request: - branches: - - master + push: + tags-ignore: + - v* + jobs: + build: runs-on: ubuntu-latest strategy: @@ -33,6 +34,7 @@ jobs: run: sbt "++${{ matrix.scalaversion }}" example/compile - name: scalafmt run: sbt "++${{ matrix.scalaversion }}" scalafmtCheck + readme: runs-on: ubuntu-latest steps: diff --git a/build.sbt b/build.sbt index 7575d5f50..f44997487 100644 --- a/build.sbt +++ b/build.sbt @@ -5,11 +5,11 @@ lazy val root = project.in(file(".")). name := "Scala.js DOM" -crossScalaVersions in ThisBuild := { +ThisBuild / crossScalaVersions := { if (scalaJSVersion.startsWith("1.")) Seq("2.12.10", "2.11.12", "2.13.1") else Seq("2.12.10", "2.11.12", "2.10.7", "2.13.1") } -scalaVersion in ThisBuild := crossScalaVersions.value.head +ThisBuild / scalaVersion := crossScalaVersions.value.head val commonSettings = Seq( version := "1.2.0-SNAPSHOT", @@ -114,7 +114,7 @@ lazy val readme = ScalatexReadme( ).settings( scalaVersion := "2.12.10", scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"), - (resources in Compile) += (fullOptJS in (example, Compile)).value.data + (Compile / resources) += (example / Compile / fullOptJS).value.data ) lazy val example = project. diff --git a/project/build.properties b/project/build.properties index c0bab0494..10fd9eee0 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.8 +sbt.version=1.5.5