Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop Java 8 #111

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Drop Java 8 #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/integration-test/Dockerfile-development
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -18,4 +18,4 @@ RUN npm install
WORKDIR /opt
RUN sbt compile

ENTRYPOINT ["/bin/bash", "--login", "-c", "sbt run"]
ENTRYPOINT ["/bin/bash", "--login", "-c", "sbt run"]
4 changes: 2 additions & 2 deletions .github/integration-test/Dockerfile-production
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"]
ENTRYPOINT ["/bin/bash", "--login", "-c", "./target/universal/stage/bin/play-scala-react-seed -Dplay.http.secret.key=ad31779d4ee49d5ad5162bf1429c32e2e9933f3b"]
23 changes: 17 additions & 6 deletions .github/workflows/build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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