mirror of
https://github.com/TeamPiped/Piped-Backend.git
synced 2024-08-14 23:51:41 +00:00
Merge remote-tracking branch 'origin/master' into add-back-hsqldb
This commit is contained in:
commit
e45c7088dc
23 changed files with 73 additions and 66 deletions
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
|
@ -11,7 +11,7 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
java: [ 17 ]
|
||||
java: [ 21 ]
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
|
@ -19,7 +19,7 @@ jobs:
|
|||
uses: actions/setup-java@v3
|
||||
with:
|
||||
java-version: ${{ matrix.java }}
|
||||
distribution: temurin
|
||||
distribution: zulu
|
||||
cache: "gradle"
|
||||
- name: Run Build
|
||||
run: ./gradlew build
|
||||
|
|
2
.github/workflows/docker-build-test.yml
vendored
2
.github/workflows/docker-build-test.yml
vendored
|
@ -25,7 +25,7 @@ jobs:
|
|||
dockerfile:
|
||||
- Dockerfile.ci
|
||||
- Dockerfile.azul.ci
|
||||
- Dockerfile.openj9.ci
|
||||
#- Dockerfile.openj9.ci
|
||||
- Dockerfile.graalvm-jvm.ci
|
||||
include:
|
||||
- sleep: 20
|
||||
|
|
4
.github/workflows/docker-build.yml
vendored
4
.github/workflows/docker-build.yml
vendored
|
@ -17,8 +17,8 @@ jobs:
|
|||
strategy:
|
||||
matrix:
|
||||
include:
|
||||
- image: 1337kavin/piped:openj9
|
||||
dockerfile: ./Dockerfile.openj9.ci
|
||||
# - image: 1337kavin/piped:openj9
|
||||
# dockerfile: ./Dockerfile.openj9.ci
|
||||
- image: 1337kavin/piped:hotspot
|
||||
dockerfile: ./Dockerfile.ci
|
||||
- image: 1337kavin/piped:latest,1337kavin/piped:azul-zulu
|
||||
|
|
|
@ -15,11 +15,11 @@ jobs:
|
|||
- uses: actions/checkout@v4
|
||||
with:
|
||||
ref: ${{ github.event.pull_request.base.sha }}
|
||||
- name: set up JDK 17
|
||||
- name: set up JDK 21
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
java-version: 17
|
||||
distribution: temurin
|
||||
java-version: 21
|
||||
distribution: zulu
|
||||
cache: "gradle"
|
||||
- name: Run Build
|
||||
run: ./gradlew shadowJar
|
||||
|
@ -39,7 +39,7 @@ jobs:
|
|||
- testing/docker-compose.cockroachdb.yml
|
||||
- testing/docker-compose.yugabytedb.yml
|
||||
dockerfile:
|
||||
- Dockerfile.ci
|
||||
- Dockerfile.azul.ci
|
||||
include:
|
||||
- sleep: 20
|
||||
- docker-compose-file: testing/docker-compose.cockroachdb.yml
|
||||
|
|
6
.github/workflows/fat-build.yml
vendored
6
.github/workflows/fat-build.yml
vendored
|
@ -9,11 +9,11 @@ jobs:
|
|||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: set up JDK 17
|
||||
- name: set up JDK 21
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
java-version: 17
|
||||
distribution: temurin
|
||||
java-version: 21
|
||||
distribution: zulu
|
||||
cache: "gradle"
|
||||
- name: Run Build
|
||||
run: ./gradlew shadowJar
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue