Skip to content

Commit

Permalink
Merge pull request #418 from mkurz/activate_anorm_examples
Browse files Browse the repository at this point in the history
Revert "Temporary disable anorm example"
  • Loading branch information
mkurz authored Nov 17, 2024
2 parents ed96a83 + 3c73d08 commit 88fc8f3
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -261,19 +261,19 @@ jobs:
cmd: |
./test.sh --sample=play-java-websocket-example --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
# scala-anorm:
# name: "Scala :: Anorm"
# uses: playframework/.github/.github/workflows/cmd.yml@v4
# needs: changes
# if: ${{ (github.event_name != 'pull_request' && !failure() && !cancelled()) || contains(fromJSON(needs.changes.outputs.samples), 'scala-anorm')}}
# with:
# java: 17, 21
# scala: 2.13.x, 3.x
# gradle-build-root: play-scala-anorm-example
# add-dimensions: >-
# { "server": [ "pekko", "netty"], "build_tool": ["sbt"] }
# cmd: |
# ./test.sh --sample=play-scala-anorm-example --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
scala-anorm:
name: "Scala :: Anorm"
uses: playframework/.github/.github/workflows/cmd.yml@v4
needs: changes
if: ${{ (github.event_name != 'pull_request' && !failure() && !cancelled()) || contains(fromJSON(needs.changes.outputs.samples), 'scala-anorm')}}
with:
java: 17, 21
scala: 2.13.x, 3.x
gradle-build-root: play-scala-anorm-example
add-dimensions: >-
{ "server": [ "pekko", "netty"], "build_tool": ["sbt"] }
cmd: |
./test.sh --sample=play-scala-anorm-example --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
scala-chatroom:
name: "Scala :: Chatroom"
Expand Down
2 changes: 1 addition & 1 deletion play-scala-anorm-example/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ lazy val root = (project in file("."))
jdbc,
evolutions,
"com.h2database" % "h2" % "2.3.232",
"org.playframework.anorm" %% "anorm" % "2.7.0",
"org.playframework.anorm" %% "anorm" % "2.8.1",
"org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test,
),
scalacOptions ++= List("-feature", "-Werror"),
Expand Down
2 changes: 1 addition & 1 deletion test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ else
buildSample play-java-websocket-example
buildSample play-java-pekko-cluster-example
buildSample play-scala-rest-api-example
# buildSample play-scala-anorm-example
buildSample play-scala-anorm-example
buildSample play-java-grpc-example
buildSample play-scala-chatroom-example
buildSample play-scala-compile-di-example
Expand Down

0 comments on commit 88fc8f3

Please sign in to comment.