Skip to content

Commit

Permalink
Updated workflows to all use Java 21
Browse files Browse the repository at this point in the history
  • Loading branch information
retrodaredevil committed Dec 5, 2024
1 parent 6ea85ac commit 4528134
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 18 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,17 @@ jobs:

# https://docs.github.com/en/actions/learn-github-actions/expressions
- if: matrix.language == 'java'
name: Set up JDK 17
uses: actions/setup-java@v3
name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17
java-version: 21
- if: matrix.language == 'java'
uses: actions/setup-node@v3
with:
node-version: 16
- if: matrix.language == 'java'
name: Install dependencies
name: Install npm dependencies
run: (cd web && npm install)

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4

- name: Set up JDK 17
uses: actions/setup-java@v3
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
# https://github.com/marketplace/actions/setup-java-jdk#supported-distributions
distribution: 'temurin'
java-version: 17
java-version: 21
- if: matrix.data.image-name == 'solarthing-server'
uses: actions/setup-node@v3
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v3
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17
java-version: 21
- uses: actions/setup-node@v3
with:
node-version: 16
- name: Install dependencies
- name: Install npm dependencies
run: (cd web && npm install)
- name: Build with Gradle
run: ./gradlew build
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release-upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ jobs:
needs: shared-outputs
steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v3
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17
java-version: 21
- uses: actions/setup-node@v3
with:
node-version: 16
- name: Install dependencies
- name: Install npm dependencies
run: (cd web && npm install)
- name: Build with Gradle
run: ./gradlew build client:shadowJar -x test
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/spotless.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17
java-version: 21
- name: Spotless check
run: ./gradlew spotlessCheck
6 changes: 5 additions & 1 deletion other/docs/installing_java_11_adv.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
## Installing Java 11 on RPi1 or RPi0
## Installing Java 11 on RPi1 or RPi0 (**Outdated Documentation**)

NOTE: This page was originally created so that people could install Java 11 on RPi1 or RPi0.
SolarThing no longer supports these devices!

If you have an RPi1 or RPi0, they both have ARMv6 processors, so you need to install Java 11 differently.

NOTE: You don't have to use Java 11. Using Java 8 with SolarThing is perfectly fine. **Go [here](./installing_java.md)
Expand Down

0 comments on commit 4528134

Please sign in to comment.