Merge branch 'dev/0.7' into future/dev

# Conflicts:
#	src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy
This commit is contained in:
modmuss50
2021-05-04 18:29:00 +01:00
14 changed files with 15 additions and 14 deletions

View File

@@ -221,7 +221,7 @@ publishing {
task writeActionsTestMatrix() {
doLast {
def testMatrix = []
file('src/test/groovy/net/fabricmc/loom/test/intergration').eachFile {
file('src/test/groovy/net/fabricmc/loom/test/integration').eachFile {
if (it.name.endsWith("Test.groovy")) {
if (it.name.endsWith("ReproducibleBuildTest.groovy")) {
// This test gets a special case to run across all os's
@@ -229,7 +229,7 @@ task writeActionsTestMatrix() {
}
def className = it.name.replace(".groovy", "")
testMatrix.add("net.fabricmc.loom.test.intergration.${className}")
testMatrix.add("net.fabricmc.loom.test.integration.${className}")
}
}