mirror of
https://github.com/BlueMap-Minecraft/BlueMap.git
synced 2024-11-22 10:35:16 +01:00
Merge branch 'fix/gh-action'
This commit is contained in:
commit
a665fb377d
19
.github/workflows/build.yml
vendored
19
.github/workflows/build.yml
vendored
@ -19,18 +19,15 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
fetch-depth: 0 # needed for versioning
|
fetch-depth: 0 # needed for versioning
|
||||||
- name: Set up JDK 1.17
|
- name: Set up Java
|
||||||
uses: actions/setup-java@v1
|
uses: actions/setup-java@v3
|
||||||
with:
|
with:
|
||||||
java-version: 17
|
distribution: 'temurin'
|
||||||
- uses: actions/cache@v3
|
java-version: |
|
||||||
with:
|
11
|
||||||
path: |
|
16
|
||||||
~/.gradle/caches
|
17
|
||||||
~/.gradle/wrapper
|
cache: 'gradle'
|
||||||
key: "${{ runner.os }}-bluemap-${{ hashFiles('**/*.gradle*') }}"
|
|
||||||
restore-keys: |
|
|
||||||
${{ runner.os }}-bluemap-
|
|
||||||
- name: Build with Gradle
|
- name: Build with Gradle
|
||||||
run: ./gradlew clean spotlessCheck test build
|
run: ./gradlew clean spotlessCheck test build
|
||||||
- uses: actions/upload-artifact@v2
|
- uses: actions/upload-artifact@v2
|
||||||
|
19
.github/workflows/publish.yml
vendored
19
.github/workflows/publish.yml
vendored
@ -11,18 +11,15 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
fetch-depth: 0 # needed for versioning
|
fetch-depth: 0 # needed for versioning
|
||||||
- name: Set up JDK 1.17
|
- name: Set up Java
|
||||||
uses: actions/setup-java@v1
|
uses: actions/setup-java@v3
|
||||||
with:
|
with:
|
||||||
java-version: 17
|
distribution: 'temurin'
|
||||||
- uses: actions/cache@v2
|
java-version: |
|
||||||
with:
|
11
|
||||||
path: |
|
16
|
||||||
~/.gradle/caches
|
17
|
||||||
~/.gradle/wrapper
|
cache: 'gradle'
|
||||||
key: "${{ runner.os }}-bluemap-${{ hashFiles('**/*.gradle*') }}"
|
|
||||||
restore-keys: |
|
|
||||||
${{ runner.os }}-bluemap-
|
|
||||||
- name: Build with Gradle
|
- name: Build with Gradle
|
||||||
env:
|
env:
|
||||||
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
|
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
|
||||||
|
@ -29,6 +29,10 @@ def javaTarget = 16
|
|||||||
java {
|
java {
|
||||||
sourceCompatibility = JavaVersion.toVersion(javaTarget)
|
sourceCompatibility = JavaVersion.toVersion(javaTarget)
|
||||||
targetCompatibility = JavaVersion.toVersion(javaTarget)
|
targetCompatibility = JavaVersion.toVersion(javaTarget)
|
||||||
|
|
||||||
|
toolchain {
|
||||||
|
languageVersion.set(JavaLanguageVersion.of(17))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
minecraft {
|
minecraft {
|
||||||
|
Loading…
Reference in New Issue
Block a user