Skip to content

Commit

Permalink
Upgrade Scalastyle, Mill and make CI run on version tag push
Browse files Browse the repository at this point in the history
  • Loading branch information
joan38 committed Jun 18, 2020
1 parent 5ed3839 commit 599b941
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: CI

on:
create:
tags:
- v*
push:
branches:
- master
Expand Down
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 2.5.2
version = 2.5.3
project.git = true
maxColumn = 120
align = more
Expand Down
8 changes: 3 additions & 5 deletions build.sc
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
import $ivy.`com.goyeau::mill-git:0.1.0-4-9b459c6`
import $ivy.`com.goyeau::mill-scalafix:8515ae6`
import $ivy.`com.goyeau::mill-scalafix:0.1.3`
import $ivy.`com.lihaoyi::mill-contrib-bsp:$MILL_VERSION`
import $ivy.`de.tototec::de.tobiasroeser.mill.integrationtest:0.3.1`
import $ivy.`io.github.davidgregory084::mill-tpolecat:0.1.3`
import com.goyeau.mill.git.GitVersionedPublishModule
import com.goyeau.mill.scalafix.ScalafixModule
import com.goyeau.mill.scalafix.StyleModule
import de.tobiasroeser.mill.integrationtest._
import io.github.davidgregory084.TpolecatModule
import mill._
import mill.scalalib._
import mill.scalalib.publish.{Developer, License, PomSettings, VersionControl}
import mill.scalalib.scalafmt.ScalafmtModule

object `mill-git` extends Cross[MillGitModule](crossScalaVersions: _*)
class MillGitModule(val crossScalaVersion: String)
extends CrossScalaModule
with TpolecatModule
with ScalafmtModule
with ScalafixModule
with StyleModule
with GitVersionedPublishModule {
lazy val millVersion = millVersionFor(crossScalaVersion)
override def compileIvyDeps =
Expand Down
2 changes: 1 addition & 1 deletion mill
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# This is a wrapper script, that automatically download mill from GitHub release pages
# You can give the required mill version with MILL_VERSION env variable
# If no version is given, it falls back to the value of DEFAULT_MILL_VERSION
DEFAULT_MILL_VERSION=0.7.2
DEFAULT_MILL_VERSION=0.7.3-10-497538

set -e

Expand Down

0 comments on commit 599b941

Please sign in to comment.