TeamPiped-mirror/Piped-Backend
1
0
Fork 0
mirror of https://github.com/TeamPiped/Piped-Backend.git synced 2024-08-14 23:51:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #572 from TeamPiped/java-17

Browse source 
Migrate project back to Java 17.
This commit is contained in:
Kavin 2023-04-27 13:14:14 +01:00 committed by GitHub
commit 7460fe2f75
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View file

@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
java: [ 19 ] java: [ 17 ]
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3

6
.github/workflows/docker-build-test.yml vendored
View file

@ -21,16 +21,16 @@ jobs:
dockerfile: dockerfile:
- Dockerfile.ci - Dockerfile.ci
- Dockerfile.openj9.ci - Dockerfile.openj9.ci
# - Dockerfile.graalvm-jvm.ci - Dockerfile.graalvm-jvm.ci
fail-fast: false fail-fast: false
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Create Version File - name: Create Version File
run: echo $(git log -1 --date=short --pretty=format:%cd)-$(git rev-parse --short HEAD) > VERSION run: echo $(git log -1 --date=short --pretty=format:%cd)-$(git rev-parse --short HEAD) > VERSION
- name: set up JDK 19 - name: set up JDK 17
uses: actions/setup-java@v3 uses: actions/setup-java@v3
with: with:
java-version: 19 java-version: 17
distribution: temurin distribution: temurin
cache: "gradle" cache: "gradle"
- name: Run Build - name: Run Build

8
.github/workflows/docker-build.yml vendored
View file

@ -17,16 +17,16 @@ jobs:
dockerfile: ./Dockerfile.openj9.ci dockerfile: ./Dockerfile.openj9.ci
- image: 1337kavin/piped:latest,1337kavin/piped:hotspot - image: 1337kavin/piped:latest,1337kavin/piped:hotspot
dockerfile: ./Dockerfile.ci dockerfile: ./Dockerfile.ci
# - image: 1337kavin/piped:graalvm-jvm - image: 1337kavin/piped:graalvm-jvm
# dockerfile: ./Dockerfile.graalvm-jvm.ci dockerfile: ./Dockerfile.graalvm-jvm.ci
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Create Version File - name: Create Version File
run: echo $(git log -1 --date=short --pretty=format:%cd)-$(git rev-parse --short HEAD) > VERSION run: echo $(git log -1 --date=short --pretty=format:%cd)-$(git rev-parse --short HEAD) > VERSION
- name: set up JDK 19 - name: set up JDK 17
uses: actions/setup-java@v3 uses: actions/setup-java@v3
with: with:
java-version: 19 java-version: 17
distribution: temurin distribution: temurin
cache: "gradle" cache: "gradle"
- name: Run Build - name: Run Build

4
Dockerfile
View file

@ -1,4 +1,4 @@
FROM eclipse-temurin:19-jdk AS build FROM eclipse-temurin:17-jdk AS build
WORKDIR /app/ WORKDIR /app/
@ -7,7 +7,7 @@ COPY . /app/
RUN --mount=type=cache,target=/root/.gradle/caches/ \ RUN --mount=type=cache,target=/root/.gradle/caches/ \
./gradlew shadowJar ./gradlew shadowJar
FROM eclipse-temurin:19-jre FROM eclipse-temurin:17-jre
WORKDIR /app/ WORKDIR /app/

2
Dockerfile.ci
View file

@ -1,4 +1,4 @@
FROM eclipse-temurin:19-jre FROM eclipse-temurin:17-jre
WORKDIR /app/ WORKDIR /app/

4
Dockerfile.openj9
View file

@ -1,4 +1,4 @@
FROM 1337kavin/openj9-19 AS build FROM ibm-semeru-runtimes:open-17-jdk AS build
WORKDIR /app/ WORKDIR /app/
@ -7,7 +7,7 @@ COPY . /app/
RUN --mount=type=cache,target=/root/.gradle/caches/ \ RUN --mount=type=cache,target=/root/.gradle/caches/ \
./gradlew shadowJar ./gradlew shadowJar
FROM 1337kavin/openj9-19:latest-jre FROM ibm-semeru-runtimes:open-17-jre
WORKDIR /app/ WORKDIR /app/

2
Dockerfile.openj9.ci
View file

@ -1,4 +1,4 @@
FROM 1337kavin/openj9-19:latest-jre FROM ibm-semeru-runtimes:open-17-jre
WORKDIR /app/ WORKDIR /app/

4
build.gradle
View file

@ -62,5 +62,5 @@ tasks.withType(JavaCompile).each {
group = 'me.kavin.piped' group = 'me.kavin.piped'
version = '1.0' version = '1.0'
sourceCompatibility = JavaVersion.VERSION_19 sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_19 targetCompatibility = JavaVersion.VERSION_17