Merge branch 'test-and11' of https://github.com/afischerdev/brouter into test-and11
This commit is contained in:
commit
7fc66c153f
3 changed files with 24 additions and 3 deletions
13
.editorconfig
Normal file
13
.editorconfig
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
root = true
|
||||||
|
|
||||||
|
[*]
|
||||||
|
end_of_line = lf
|
||||||
|
insert_final_newline = true
|
||||||
|
|
||||||
|
[*.java]
|
||||||
|
indent_style = space
|
||||||
|
indent_size = 2
|
||||||
|
|
||||||
|
[*.gradle]
|
||||||
|
indent_style = space
|
||||||
|
indent_size = 4
|
11
.github/workflows/gradle.yml
vendored
11
.github/workflows/gradle.yml
vendored
|
@ -16,11 +16,18 @@ jobs:
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- name: Set up JDK 8
|
- name: Set up JDK 11
|
||||||
uses: actions/setup-java@v2
|
uses: actions/setup-java@v2
|
||||||
with:
|
with:
|
||||||
java-version: '8'
|
java-version: '11'
|
||||||
distribution: 'zulu'
|
distribution: 'zulu'
|
||||||
cache: gradle
|
cache: gradle
|
||||||
|
- name: Create local.properties
|
||||||
|
run: touch local.properties
|
||||||
- name: Build with Gradle
|
- name: Build with Gradle
|
||||||
run: ./gradlew build
|
run: ./gradlew build
|
||||||
|
- name: Upload ZIP
|
||||||
|
uses: actions/upload-artifact@v2
|
||||||
|
with:
|
||||||
|
name: ZIP
|
||||||
|
path: brouter-server/build/distributions/brouter-*.zip
|
||||||
|
|
|
@ -30,7 +30,8 @@ application {
|
||||||
}
|
}
|
||||||
|
|
||||||
distZip {
|
distZip {
|
||||||
archiveFileName = 'brouter-' + project.version + '.zip'
|
dependsOn fatJar
|
||||||
|
archiveFileName = 'brouter-' + project.version + '.zip'
|
||||||
}
|
}
|
||||||
|
|
||||||
distributions {
|
distributions {
|
||||||
|
|
Loading…
Reference in a new issue