From 055cadfb89ae6b6ec96de0d82dbb6508e70919e6 Mon Sep 17 00:00:00 2001
From: Matthias Kurz <m.kurz@irregular.at>
Date: Mon, 17 Oct 2022 22:30:40 +0200
Subject: [PATCH] Drop Java 8

---
 .../integration-test/Dockerfile-development   |  4 ++--
 .../integration-test/Dockerfile-production    |  4 ++--
 .github/workflows/build-test.yml              | 23 ++++++++++++++-----
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/.github/integration-test/Dockerfile-development b/.github/integration-test/Dockerfile-development
index f57f4b8..dced3e9 100644
--- a/.github/integration-test/Dockerfile-development
+++ b/.github/integration-test/Dockerfile-development
@@ -1,4 +1,4 @@
-FROM hseeberger/scala-sbt:8u312_1.6.2_2.13.8
+FROM hseeberger/scala-sbt:eclipse-temurin-11.0.14.1_1.6.2_2.13.8
 EXPOSE 3000
 EXPOSE 9000
 
@@ -18,4 +18,4 @@ RUN npm install
 WORKDIR /opt
 RUN sbt compile
 
-ENTRYPOINT ["/bin/bash", "--login", "-c", "sbt run"]
\ No newline at end of file
+ENTRYPOINT ["/bin/bash", "--login", "-c", "sbt run"]
diff --git a/.github/integration-test/Dockerfile-production b/.github/integration-test/Dockerfile-production
index e9537c5..7bf2d73 100644
--- a/.github/integration-test/Dockerfile-production
+++ b/.github/integration-test/Dockerfile-production
@@ -1,4 +1,4 @@
-FROM hseeberger/scala-sbt:8u312_1.6.2_2.13.8
+FROM hseeberger/scala-sbt:eclipse-temurin-11.0.14.1_1.6.2_2.13.8
 EXPOSE 9000
 
 RUN ln -s /usr/local/openjdk-8/bin/java /usr/bin/java
@@ -17,4 +17,4 @@ RUN npm install
 WORKDIR /opt
 RUN sbt stage
 
-ENTRYPOINT ["/bin/bash", "--login", "-c", "./target/universal/stage/bin/play-scala-react-seed -Dplay.http.secret.key=ad31779d4ee49d5ad5162bf1429c32e2e9933f3b"]
\ No newline at end of file
+ENTRYPOINT ["/bin/bash", "--login", "-c", "./target/universal/stage/bin/play-scala-react-seed -Dplay.http.secret.key=ad31779d4ee49d5ad5162bf1429c32e2e9933f3b"]
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 6c88d71..3bf3c32 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -1,11 +1,12 @@
 name: Check
 
 on:
+  pull_request:
+
   push:
     branches:
-      - main
+      - main # Check branch after merge
     tags: ["*"]
-  pull_request:
 
 concurrency:
   # Only run once for latest commit per ref and cancel other (previous) runs.
@@ -43,17 +44,19 @@ jobs:
 
   check-code-style:
     name: Code Style
-    uses: playframework/.github/.github/workflows/sbt.yml@v1
+    uses: playframework/.github/.github/workflows/cmd.yml@v3
     with:
       cmd: sbt validateCode
 
   tests:
     name: Tests
-    needs: # Waiting more lightweight checks
+    needs:
       - "check-code-style"
-    uses: playframework/.github/.github/workflows/sbt.yml@v1
+    uses: playframework/.github/.github/workflows/cmd.yml@v3
     with:
-      cmd: sbt test
+      java: 17, 11
+      scala: 2.13.x
+      cmd: sbt ++$MATRIX_SCALA test
 
   run-application:
     strategy:
@@ -89,3 +92,11 @@ jobs:
       - name: Wait for application
         working-directory: .github/integration-test
         run: scala-cli test . --server=false --java-opt "-Dapplication.port=${{ matrix.port }}"
+
+  finish:
+    name: Finish
+    if: github.event_name == 'pull_request'
+    needs: # Should be last
+      - "tests"
+      - "run-application"
+    uses: playframework/.github/.github/workflows/rtm.yml@v3