Skip to content

Commit

Permalink
Merge pull request #676 from mkurz/cmd.yml
Browse files Browse the repository at this point in the history
Switch to cmd.yml
  • Loading branch information
mergify[bot] authored May 6, 2022
2 parents bc9b9c4 + bde4b9b commit 470bd75
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 12 deletions.
18 changes: 8 additions & 10 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ concurrency:
jobs:
check-code-style:
name: Code Style
uses: playframework/.github/.github/workflows/sbt.yml@v1
uses: playframework/.github/.github/workflows/cmd.yml@v2
with:
cmd: sbt validateCode

check-binary-compatibility:
name: Binary Compatibility
uses: playframework/.github/.github/workflows/binary-check.yml@v1
uses: playframework/.github/.github/workflows/binary-check.yml@v2

check-docs:
name: Docs
uses: playframework/.github/.github/workflows/sbt.yml@v1
uses: playframework/.github/.github/workflows/cmd.yml@v2
with:
cmd: sbt doc

Expand All @@ -31,16 +31,14 @@ jobs:
- "check-code-style"
- "check-binary-compatibility"
- "check-docs"
uses: playframework/.github/.github/workflows/sbt-matrix.yml@v1
uses: playframework/.github/.github/workflows/cmd.yml@v2
with:
java: >-
[ "11", "8" ]
scala: >-
[ "2.13.8", "3.1.2-RC3" ]
cmd: sbt ++$SCALA_VERSION 'testOnly -- xonly timefactor 5'
java: 11, 8
scala: 2.13.8, 3.1.2-RC3
cmd: sbt ++$MATRIX_SCALA 'testOnly -- xonly timefactor 5'

finish:
name: Finish
needs: # Should be last
- "tests"
uses: playframework/.github/.github/workflows/rtm.yml@v1
uses: playframework/.github/.github/workflows/rtm.yml@v2
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
publish-artifacts:
name: Publish / Artifacts
uses: playframework/.github/.github/workflows/publish.yml@v1
uses: playframework/.github/.github/workflows/publish.yml@v2
secrets:
username: ${{ secrets.SONATYPE_USERNAME }}
password: ${{ secrets.SONATYPE_PASSWORD }}
Expand Down
9 changes: 8 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -450,4 +450,11 @@ lazy val root = project
bench
)

addCommandAlias("validateCode", "headerCheckAll; scalafmtSbtCheck; scalafmtCheckAll")
addCommandAlias(
"validateCode",
List(
"headerCheckAll",
"scalafmtSbtCheck",
"scalafmtCheckAll",
).mkString(";")
)

0 comments on commit 470bd75

Please sign in to comment.