mirror of https://github.com/FabricMC/yarn.git
parent
a0592ba0ce
commit
b23b7c6681
|
@ -4,7 +4,7 @@ jobs:
|
||||||
build:
|
build:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
java: [16-jdk]
|
java: [17-jdk]
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
container:
|
container:
|
||||||
image: openjdk:${{ matrix.java }}
|
image: openjdk:${{ matrix.java }}
|
||||||
|
@ -12,10 +12,7 @@ jobs:
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: gradle/wrapper-validation-action@v1
|
- uses: gradle/wrapper-validation-action@v1
|
||||||
- run: |
|
- run: ./gradlew build javadocJar checkMappings --stacktrace
|
||||||
curl https://maven.fabricmc.net/net/java/jdk/openjdk-17-ea%2B24_linux-x64_bin.tar.gz --output java.tar.gz
|
|
||||||
tar -xf java.tar.gz
|
|
||||||
- run: ./gradlew build javadocJar checkMappings --stacktrace -Porg.gradle.java.installations.auto-download=false -Porg.gradle.java.installations.paths=$(pwd)/jdk-17
|
|
||||||
- name: Build artifacts
|
- name: Build artifacts
|
||||||
if: ${{ matrix.java == '16-jdk' }}
|
if: ${{ matrix.java == '16-jdk' }}
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
|
|
|
@ -1,25 +1,16 @@
|
||||||
name: Publish
|
name: Publish
|
||||||
on: [push]
|
on: [push]
|
||||||
|
concurrency: ci-${{ github.ref }}
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
container:
|
container:
|
||||||
image: openjdk:16-jdk
|
image: openjdk:17-jdk
|
||||||
options: --user root
|
options: --user root
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: gradle/wrapper-validation-action@v1
|
- uses: gradle/wrapper-validation-action@v1
|
||||||
|
|
||||||
# Ensure that releases are not ran in parallel, this ensures that the latest commit is the latest release
|
|
||||||
# See https://github.com/softprops/turnstyle
|
|
||||||
- name: Turnstyle
|
|
||||||
uses: softprops/turnstyle@v1
|
|
||||||
with:
|
|
||||||
continue-after-seconds: 3600
|
|
||||||
same-branch-only: true
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
|
|
||||||
# Generate the build number based on tags to allow per branch build numbers, not something github provides by default.
|
# Generate the build number based on tags to allow per branch build numbers, not something github provides by default.
|
||||||
- name: Generate build number
|
- name: Generate build number
|
||||||
id: buildnumber
|
id: buildnumber
|
||||||
|
@ -28,10 +19,7 @@ jobs:
|
||||||
token: ${{ secrets.github_token }}
|
token: ${{ secrets.github_token }}
|
||||||
prefix: ${{ github.ref }}
|
prefix: ${{ github.ref }}
|
||||||
|
|
||||||
- run: |
|
- run: ./gradlew build javadocJar checkVersion publish --stacktrace
|
||||||
curl https://maven.fabricmc.net/net/java/jdk/openjdk-17-ea%2B24_linux-x64_bin.tar.gz --output java.tar.gz
|
|
||||||
tar -xf java.tar.gz
|
|
||||||
- run: ./gradlew build javadocJar checkVersion publish --stacktrace -Porg.gradle.java.installations.auto-download=false -Porg.gradle.java.installations.paths=$(pwd)/jdk-17
|
|
||||||
env:
|
env:
|
||||||
MAVEN_URL: ${{ secrets.MAVEN_URL }}
|
MAVEN_URL: ${{ secrets.MAVEN_URL }}
|
||||||
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
|
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
|
||||||
|
|
|
@ -827,13 +827,6 @@ javadoc {
|
||||||
group = "javadoc generation"
|
group = "javadoc generation"
|
||||||
outputs.upToDateWhen { false }
|
outputs.upToDateWhen { false }
|
||||||
|
|
||||||
if (ENV.CI) {
|
|
||||||
// Java 17 is provided on CI to build the javadocs with, see https://github.com/FabricMC/yarn/issues/2429
|
|
||||||
javadocTool = javaToolchains.javadocToolFor {
|
|
||||||
languageVersion = JavaLanguageVersion.of(17)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
def mappingPoetJar = project.provider { zipTree configurations.mappingPoetJar.singleFile }
|
def mappingPoetJar = project.provider { zipTree configurations.mappingPoetJar.singleFile }
|
||||||
|
|
||||||
failOnError = false
|
failOnError = false
|
||||||
|
|
Binary file not shown.
|
@ -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.1.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|
Loading…
Reference in New Issue