From 7e37b1786611e728cfcc248011c818adaf8b3c1e Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Wed, 4 May 2022 00:07:38 +0200 Subject: [PATCH 1/4] This is a bit nicer IMHO --- build.sbt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index b08d9c0e..29401af4 100644 --- a/build.sbt +++ b/build.sbt @@ -450,4 +450,11 @@ lazy val root = project bench ) -addCommandAlias("validateCode", "headerCheckAll; scalafmtSbtCheck; scalafmtCheckAll") +addCommandAlias( + "validateCode", + List( + "headerCheckAll", + "scalafmtSbtCheck", + "scalafmtCheckAll", + ).mkString(";") +) From eb7a92d8e39799a620ead27285896c6b260ebffd Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Wed, 4 May 2022 00:09:12 +0200 Subject: [PATCH 2/4] Switch to cmd.yml --- .github/workflows/build-test.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 2a9ed04d..ae88acd6 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -11,7 +11,7 @@ concurrency: jobs: check-code-style: name: Code Style - uses: playframework/.github/.github/workflows/sbt.yml@v1 + uses: playframework/.github/.github/workflows/cmd.yml@dynamic_matrix with: cmd: sbt validateCode @@ -21,7 +21,7 @@ jobs: check-docs: name: Docs - uses: playframework/.github/.github/workflows/sbt.yml@v1 + uses: playframework/.github/.github/workflows/cmd.yml@dynamic_matrix with: cmd: sbt doc @@ -31,13 +31,15 @@ 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@dynamic_matrix with: java: >- [ "11", "8" ] - scala: >- - [ "2.13.8", "3.1.2-RC3" ] - cmd: sbt ++$SCALA_VERSION 'testOnly -- xonly timefactor 5' + add-dimensions: >- + { + "scala": [ "2.13.8", "3.1.2-RC3" ] + } + cmd: sbt ++$MATRIX_SCALA 'testOnly -- xonly timefactor 5' finish: name: Finish From 8f78c6695ca706543d222225c4aa2a3b9e9f9fb6 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Wed, 4 May 2022 16:42:21 +0200 Subject: [PATCH 3/4] java and scala inputs as comma separated string --- .github/workflows/build-test.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index ae88acd6..ef2848c4 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -11,7 +11,7 @@ concurrency: jobs: check-code-style: name: Code Style - uses: playframework/.github/.github/workflows/cmd.yml@dynamic_matrix + uses: playframework/.github/.github/workflows/cmd.yml@cmd-ihostage with: cmd: sbt validateCode @@ -21,7 +21,7 @@ jobs: check-docs: name: Docs - uses: playframework/.github/.github/workflows/cmd.yml@dynamic_matrix + uses: playframework/.github/.github/workflows/cmd.yml@cmd-ihostage with: cmd: sbt doc @@ -31,14 +31,10 @@ jobs: - "check-code-style" - "check-binary-compatibility" - "check-docs" - uses: playframework/.github/.github/workflows/cmd.yml@dynamic_matrix + uses: playframework/.github/.github/workflows/cmd.yml@cmd-ihostage with: - java: >- - [ "11", "8" ] - add-dimensions: >- - { - "scala": [ "2.13.8", "3.1.2-RC3" ] - } + java: 11, 8 + scala: 2.13.8, 3.1.2-RC3 cmd: sbt ++$MATRIX_SCALA 'testOnly -- xonly timefactor 5' finish: From bde4b9b3c2f3a45087abc01de1052e09091fa428 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Fri, 6 May 2022 11:25:51 +0200 Subject: [PATCH 4/4] Switch to v2 --- .github/workflows/build-test.yml | 10 +++++----- .github/workflows/publish.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index ef2848c4..7ce260f4 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -11,17 +11,17 @@ concurrency: jobs: check-code-style: name: Code Style - uses: playframework/.github/.github/workflows/cmd.yml@cmd-ihostage + 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/cmd.yml@cmd-ihostage + uses: playframework/.github/.github/workflows/cmd.yml@v2 with: cmd: sbt doc @@ -31,7 +31,7 @@ jobs: - "check-code-style" - "check-binary-compatibility" - "check-docs" - uses: playframework/.github/.github/workflows/cmd.yml@cmd-ihostage + uses: playframework/.github/.github/workflows/cmd.yml@v2 with: java: 11, 8 scala: 2.13.8, 3.1.2-RC3 @@ -41,4 +41,4 @@ jobs: name: Finish needs: # Should be last - "tests" - uses: playframework/.github/.github/workflows/rtm.yml@v1 + uses: playframework/.github/.github/workflows/rtm.yml@v2 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f0004ffe..14b41c9d 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -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 }}