mirror of
https://github.com/TeamPiped/Piped-Backend.git
synced 2024-08-14 23:51:41 +00:00
Merge pull request #572 from TeamPiped/java-17
Migrate project back to Java 17.
This commit is contained in:
commit
7460fe2f75
8 changed files with 16 additions and 16 deletions
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
|
@ -11,7 +11,7 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
java: [ 19 ]
|
||||
java: [ 17 ]
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
|
||||
|
|
6
.github/workflows/docker-build-test.yml
vendored
6
.github/workflows/docker-build-test.yml
vendored
|
@ -21,16 +21,16 @@ jobs:
|
|||
dockerfile:
|
||||
- Dockerfile.ci
|
||||
- Dockerfile.openj9.ci
|
||||
# - Dockerfile.graalvm-jvm.ci
|
||||
- Dockerfile.graalvm-jvm.ci
|
||||
fail-fast: false
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- name: Create Version File
|
||||
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
|
||||
with:
|
||||
java-version: 19
|
||||
java-version: 17
|
||||
distribution: temurin
|
||||
cache: "gradle"
|
||||
- name: Run Build
|
||||
|
|
8
.github/workflows/docker-build.yml
vendored
8
.github/workflows/docker-build.yml
vendored
|
@ -17,16 +17,16 @@ jobs:
|
|||
dockerfile: ./Dockerfile.openj9.ci
|
||||
- image: 1337kavin/piped:latest,1337kavin/piped:hotspot
|
||||
dockerfile: ./Dockerfile.ci
|
||||
# - image: 1337kavin/piped:graalvm-jvm
|
||||
# dockerfile: ./Dockerfile.graalvm-jvm.ci
|
||||
- image: 1337kavin/piped:graalvm-jvm
|
||||
dockerfile: ./Dockerfile.graalvm-jvm.ci
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- name: Create Version File
|
||||
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
|
||||
with:
|
||||
java-version: 19
|
||||
java-version: 17
|
||||
distribution: temurin
|
||||
cache: "gradle"
|
||||
- name: Run Build
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM eclipse-temurin:19-jdk AS build
|
||||
FROM eclipse-temurin:17-jdk AS build
|
||||
|
||||
WORKDIR /app/
|
||||
|
||||
|
@ -7,7 +7,7 @@ COPY . /app/
|
|||
RUN --mount=type=cache,target=/root/.gradle/caches/ \
|
||||
./gradlew shadowJar
|
||||
|
||||
FROM eclipse-temurin:19-jre
|
||||
FROM eclipse-temurin:17-jre
|
||||
|
||||
WORKDIR /app/
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM eclipse-temurin:19-jre
|
||||
FROM eclipse-temurin:17-jre
|
||||
|
||||
WORKDIR /app/
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM 1337kavin/openj9-19 AS build
|
||||
FROM ibm-semeru-runtimes:open-17-jdk AS build
|
||||
|
||||
WORKDIR /app/
|
||||
|
||||
|
@ -7,7 +7,7 @@ COPY . /app/
|
|||
RUN --mount=type=cache,target=/root/.gradle/caches/ \
|
||||
./gradlew shadowJar
|
||||
|
||||
FROM 1337kavin/openj9-19:latest-jre
|
||||
FROM ibm-semeru-runtimes:open-17-jre
|
||||
|
||||
WORKDIR /app/
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM 1337kavin/openj9-19:latest-jre
|
||||
FROM ibm-semeru-runtimes:open-17-jre
|
||||
|
||||
WORKDIR /app/
|
||||
|
||||
|
|
|
@ -62,5 +62,5 @@ tasks.withType(JavaCompile).each {
|
|||
|
||||
group = 'me.kavin.piped'
|
||||
version = '1.0'
|
||||
sourceCompatibility = JavaVersion.VERSION_19
|
||||
targetCompatibility = JavaVersion.VERSION_19
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
|
|
Loading…
Reference in a new issue