Merge remote-tracking branch 'FabricMC/exp/0.11' into dev/0.11.0

# Conflicts:
#	.github/workflows/publish.yml
#	.github/workflows/test.yml
#	bootstrap/test-project/build.gradle
#	build.gradle
#	src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
#	src/main/java/net/fabricmc/loom/extension/MinecraftGradleExtension.java
#	src/main/java/net/fabricmc/loom/util/Constants.java
This commit is contained in:
shedaniel
2021-12-08 22:06:34 +08:00
19 changed files with 45 additions and 472 deletions

View File

@@ -8,6 +8,7 @@ on:
- 'dev/0.8'
- 'dev/0.9'
- 'dev/0.10.0'
- 'dev/0.11.0'
jobs:
build:
@@ -16,10 +17,10 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Set up JDK 16
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 16
java-version: 17
- name: Upload to Maven
run: ./gradlew publish --stacktrace
env:

View File

@@ -5,7 +5,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: [ 7.0.0-jdk16 , 7.2-jdk17 ]
version: [ 7.3.1-jdk17 ]
runs-on: ubuntu-20.04
container:
image: gradle:${{ matrix.version }}
@@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-20.04
container:
image: gradle:7.0.1-jdk16
image: gradle:7.3.1-jdk17
options: --user root
steps:
@@ -40,7 +40,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: [7.0.0-jdk16 , 7.2-jdk17]
version: [7.3.1-jdk17]
test: ${{ fromJson(needs.prepare_test_matrix.outputs.matrix) }}
runs-on: ubuntu-20.04
@@ -66,10 +66,10 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [ 16 ]
java: [ 17 ]
test: ${{ fromJson(needs.prepare_test_matrix.outputs.matrix) }}
runs-on: windows-2019
runs-on: windows-2022
steps:
- uses: actions/checkout@v2