From f8e8aad1d91d96aa3b13992574b660642d9a0c17 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Tue, 8 Oct 2024 10:33:57 +0200 Subject: [PATCH 1/3] Setup 10.0.x branch --- .github/dependabot.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 186bce4..105a903 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,6 +4,13 @@ updates: directory: "/" schedule: interval: "weekly" + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + target-branch: "10.0.x" + commit-message: + prefix: "[10.0.x] " - package-ecosystem: "github-actions" directory: "/" schedule: From 2fffc6d598154fc20731f396563c878854ac5b11 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Tue, 8 Oct 2024 10:34:09 +0200 Subject: [PATCH 2/3] Don't pin deps anymore, we are in dev branch here now --- .github/scala-steward.conf | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.github/scala-steward.conf b/.github/scala-steward.conf index 0790d06..d866646 100644 --- a/.github/scala-steward.conf +++ b/.github/scala-steward.conf @@ -13,15 +13,4 @@ buildRoots = [ ] updates.pin = [ - { groupId = "org.playframework", artifactId = "play", version = "3.0." }, - { groupId = "org.playframework", artifactId = "play-akka-http-server", version = "3.0." }, - { groupId = "org.playframework", artifactId = "play-filters-helpers", version = "3.0." }, - { groupId = "org.playframework", artifactId = "play-java-forms", version = "3.0." }, - { groupId = "org.playframework", artifactId = "play-logback", version = "3.0." }, - { groupId = "org.playframework", artifactId = "play-server", version = "3.0." }, - { groupId = "org.playframework", artifactId = "play-specs2", version = "3.0." }, - { groupId = "org.playframework", artifactId = "play-test", version = "3.0." }, - { groupId = "org.playframework", artifactId = "sbt-plugin", version = "3.0." }, - { groupId = "org.playframework", artifactId = "play-mailer-guice", version = "10.0." }, - { groupId = "org.playframework", artifactId = "play-mailer", version = "10.0." } ] From c5675498a1d076f132085b7defd2351cbb0741db Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Tue, 8 Oct 2024 10:34:23 +0200 Subject: [PATCH 3/3] Test against Java 21 also --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index a3c5e44..d575e3c 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -37,7 +37,7 @@ jobs: - "check-docs" uses: playframework/.github/.github/workflows/cmd.yml@v3 with: - java: 17, 11 + java: 21, 17, 11 scala: 2.13.x, 3.x cmd: | sbt ++$MATRIX_SCALA test