Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# .git-blame-ignore-revs

# scalafmt mass change
3686bb47a5b215733a46c3393a51e950fcaa635f
28 changes: 28 additions & 0 deletions .github/workflows/format.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Check formatting for modified files with scalafmt

on:
pull_request:
paths-ignore: ['**.md']

jobs:
format:

runs-on: ubuntu-latest

steps:

- uses: actions/checkout@v4
with:
fetch-depth: 2
ref: ${{ github.event.pull_request.head.sha }}

- name: Set up JDK 17
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17
cache: sbt

- name: Check formatting for modified files
run: |
sbt scalafmtCheckAll
8 changes: 7 additions & 1 deletion project/Settings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import Version._
import sbt.Keys._
import sbt._
import sbtassembly.AssemblyPlugin.autoImport._
import org.scalafmt.sbt.ScalafmtPlugin.autoImport.scalafmtFilter

object Settings {

Expand Down Expand Up @@ -41,9 +42,14 @@ object Settings {
assembly / test := {}
)

val scalafmtSettings = List(
Global / excludeLintKeys += scalafmtFilter,
Global / scalafmtFilter := "diff-ref=HEAD^"
)

//common settings for all sbt subprojects
val commonSettings =
commonBuildSettings ++ commonAssemblySettings ++ commonTestSettings ++ List(
commonBuildSettings ++ commonAssemblySettings ++ commonTestSettings ++ scalafmtSettings ++ List(
organization := "org.broadinstitute.dsde.firecloud",
scalaVersion := "2.13.15",
resolvers := proxyResolvers ++: resolvers.value ++: commonResolvers,
Expand Down
Loading