Merge remote-tracking branch 'upstream/fabric' into villager_rng_crac…

…king

# Conflicts:
#	gradle.properties

.github/workflows/build.yml

@@ -21,8 +21,14 @@ jobs:
             ~/.gradle/caches
             ~/.gradle/wrapper
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+      - run: ./gradlew test --stacktrace --no-daemon
       - run: ./gradlew build -Pmod_version="$(git describe --always --tags | cut -c2-)" --stacktrace --no-daemon
       - uses: actions/upload-artifact@v3
         with:
           name: clientcommands-snapshot
           path: build/libs/
+      - uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: test-results
+          path: build/reports/

.github/workflows/check.yml

@@ -19,4 +19,9 @@ jobs:
             ~/.gradle/caches
             ~/.gradle/wrapper
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-      - run: ./gradlew build --stacktrace --no-daemon
+      - run: ./gradlew test --stacktrace --no-daemon
+      - uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: test-results
+          path: build/reports/

build.gradle

@@ -73,6 +73,14 @@ dependencies {
 	include api('net.fabricmc:mapping-io:0.5.1')
 
 	codeGenImplementation sourceSets.main.output
+
+	testImplementation "net.fabricmc:fabric-loader-junit:${project.loader_version}"
+	testImplementation "org.junit.jupiter:junit-jupiter:${project.junit_version}"
+}
+
+test {
+	useJUnitPlatform()
+	systemProperty('clientcommands.regressionTestDir', file('regressionTests').absolutePath)
 }
 
 jar {