mirror of https://github.com/FabricMC/yarn.git
Fix broken javadoc jar (#3011)
* Try building against jdk18 * update grade * Update asm for unpick * Set ignore-source-errors
This commit is contained in:
parent
ab17c13eb1
commit
c490cdb066
|
@ -4,7 +4,7 @@ jobs:
|
||||||
build:
|
build:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
java: [17-jdk]
|
java: [17-jdk, 18-jdk]
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
container:
|
container:
|
||||||
image: openjdk:${{ matrix.java }}
|
image: openjdk:${{ matrix.java }}
|
||||||
|
@ -14,7 +14,7 @@ jobs:
|
||||||
- uses: gradle/wrapper-validation-action@v1
|
- uses: gradle/wrapper-validation-action@v1
|
||||||
- run: ./gradlew build javadocJar checkMappings --stacktrace
|
- run: ./gradlew build javadocJar checkMappings --stacktrace
|
||||||
- name: Build artifacts
|
- name: Build artifacts
|
||||||
if: ${{ matrix.java == '17-jdk' }}
|
if: ${{ matrix.java == '18-jdk' }}
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
uses: actions/upload-artifact@v2
|
uses: actions/upload-artifact@v2
|
||||||
with:
|
with:
|
||||||
|
|
|
@ -6,7 +6,7 @@ jobs:
|
||||||
if: ${{ github.repository_owner == 'FabricMC' }}
|
if: ${{ github.repository_owner == 'FabricMC' }}
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
container:
|
container:
|
||||||
image: openjdk:17-jdk
|
image: openjdk:18-jdk
|
||||||
options: --user root
|
options: --user root
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
|
|
@ -81,6 +81,11 @@ dependencies {
|
||||||
decompileClasspath "net.fabricmc:cfr:${project.cfr_version}"
|
decompileClasspath "net.fabricmc:cfr:${project.cfr_version}"
|
||||||
mappingPoetJar "net.fabricmc:mappingpoet:${project.mappingpoet_version}"
|
mappingPoetJar "net.fabricmc:mappingpoet:${project.mappingpoet_version}"
|
||||||
unpick "net.fabricmc.unpick:unpick-cli:${project.unpick_version}"
|
unpick "net.fabricmc.unpick:unpick-cli:${project.unpick_version}"
|
||||||
|
// Update asm to allow running on JDK 18
|
||||||
|
unpick "org.ow2.asm:asm:9.2"
|
||||||
|
unpick "org.ow2.asm:asm-tree:9.2"
|
||||||
|
unpick "org.ow2.asm:asm-commons:9.2"
|
||||||
|
unpick "org.ow2.asm:asm-util:9.2"
|
||||||
}
|
}
|
||||||
|
|
||||||
def setupGroup = "jar setup"
|
def setupGroup = "jar setup"
|
||||||
|
@ -862,6 +867,7 @@ javadoc {
|
||||||
it.use()
|
it.use()
|
||||||
|
|
||||||
addBooleanOption "-allow-script-in-comments", true
|
addBooleanOption "-allow-script-in-comments", true
|
||||||
|
addBooleanOption "-ignore-source-errors", true
|
||||||
links(
|
links(
|
||||||
'https://guava.dev/releases/21.0/api/docs/',
|
'https://guava.dev/releases/21.0/api/docs/',
|
||||||
'https://www.javadoc.io/doc/com.google.code.gson/gson/2.8.0/',
|
'https://www.javadoc.io/doc/com.google.code.gson/gson/2.8.0/',
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|
Loading…
Reference in New Issue