Skip to content

Commit

Permalink
fix(cd): add JDK 21 to deploy step and upgrade Java version for sou…
Browse files Browse the repository at this point in the history
…rce / target compatability
  • Loading branch information
bas-kirill committed Jul 21, 2024
1 parent c3af7ac commit b893f51
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 9 deletions.
18 changes: 12 additions & 6 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
linter:
runs-on: ubuntu-22.04
steps:
- name: Set up JDK 11 (Temurin)
- name: Set up JDK 21 (Temurin)
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11.0'
java-version: '21.0'

- name: Checkout Code
uses: actions/checkout@v4
Expand All @@ -27,11 +27,11 @@ jobs:
static-analyzer:
runs-on: ubuntu-22.04
steps:
- name: Set up JDK 11 (Temurin)
- name: Set up JDK 21 (Temurin)
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11.0'
java-version: '21.0'

- name: Checkout Code
uses: actions/checkout@v4
Expand All @@ -49,11 +49,11 @@ jobs:
pull-requests: write

steps:
- name: Set up JDK 11 (Temurin)
- name: Set up JDK 21 (Temurin)
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11.0'
java-version: '21.0'

- name: Checkout Code
uses: actions/checkout@v4
Expand All @@ -79,6 +79,12 @@ jobs:
runs-on: ubuntu-22.04
needs: [ "linter", "static-analyzer", "unit-tests" ]
steps:
- name: Set up JDK 21 (Temurin)
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '21.0'

- name: Check out the repo
uses: actions/checkout@v4

Expand Down
5 changes: 2 additions & 3 deletions server/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ group = "mu.muse"
version = "0.0.1-SNAPSHOT"

java {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
toolchain.languageVersion = JavaLanguageVersion.of(11)
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlin {
Expand Down

0 comments on commit b893f51

Please sign in to comment.