Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2020-08-14 10:48:40 -04:00
parent ffb2d6eeaa 0cac9f379e
commit 44a86ef2e7
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/gradle.yml
+2 -2
View File
@@ -13,7 +13,7 @@ jobs:
with: with:
java-version: 8 java-version: 8
- name: Run unit tests with gradle and Java 8 - name: Run unit tests with gradle and Java 8
run: ./gradlew test run: ./gradlew compileJava
buildJava14: buildJava14:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@@ -25,4 +25,4 @@ jobs:
with: with:
java-version: 14 java-version: 14
- name: Run unit tests with gradle and Java 14 - name: Run unit tests with gradle and Java 14
run: ./gradlew test run: ./gradlew compileJava
servers.json
+3
View File
@@ -65,6 +65,9 @@
{ {
"address": "twsmindustry.24x7.hk" "address": "twsmindustry.24x7.hk"
}, },
{
"address": "twsmindustry.24x7.hk:6568"
},
{ {
"address": "Chaotic-Neutral.ddns.net:1111" "address": "Chaotic-Neutral.ddns.net:1111"
}, },