# Conflicts:

#	core/src/mindustry/mod/ClassMap.java
This commit is contained in:
Anuken
2021-06-15 19:29:12 -04:00
parent ac111677c0
commit eed91eaaa0
72 changed files with 820 additions and 704 deletions

View File

@@ -3,15 +3,15 @@ name: Pull Request Tests
on: [pull_request, workflow_dispatch]
jobs:
buildJava14:
testPR:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 14
- name: Set up JDK 16
uses: actions/setup-java@v1
with:
java-version: 14
java-version: 16
- name: Run unit tests and build JAR
run: ./gradlew test desktop:dist
- name: Upload desktop JAR for testing