Sync with master #685

Merged
greg6775 merged 13 commits from master into greg-dev 2021-07-21 23:20:14 +02:00
Showing only changes of commit f918ea18eb - Show all commits

View file

@ -8,7 +8,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v2.3.4 - uses: actions/checkout@v2.3.4
- name: Set up JDK 15 - name: Set up JDK 15
uses: actions/setup-java@v1.3.4 uses: actions/setup-java@v1.4.3
with: with:
java-version: '15' java-version: '15'
- name: Build with Maven - name: Build with Maven
@ -21,9 +21,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v2.3.4 - uses: actions/checkout@v2.3.4
- name: Set up JDK 15 - name: Set up JDK 15
uses: actions/setup-java@v1.3.4 uses: actions/setup-java@v1.4.3
with: with:
java-version: 15'' java-version: '15'
- name: Build Final Jar - name: Build Final Jar
run: mvn clean compile assembly:single run: mvn clean compile assembly:single
- name: Copy folder content recursively to remote - name: Copy folder content recursively to remote