Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-05 18:21:27 +01:00
Code Issues Projects Releases Wiki Activity

Updated workflow for Github Actions and fixed typo

Browse Source
This commit is contained in:
Luccboy 2021-11-30 20:05:09 +01:00
parent 58f62b5906
commit e70067a42d
No known key found for this signature in database
GPG Key ID: 76BE98798CD9E112
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/flamecord-build.yml vendored
View File

@ -15,14 +15,14 @@ jobs:
# latest version up to the moment.
strategy:
matrix:
java: [8, 11, 16]
java: [8, 11, 17]
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Setup JAVA ${{ matrix.java }}
uses: actions/setup-java@v2.1.0
uses: actions/setup-java@v2
with:
java-version: ${{ matrix.java }}
distribution: 'adopt'
@ -30,7 +30,7 @@ jobs:
# The corresponding dependencies are stored in the cache to speed up the test.
- name: Cache Maven Packages
uses: actions/cache@v2.1.6
uses: actions/cache@v2
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@ -44,7 +44,7 @@ jobs:
# An artifact is generated in a compressed file according to each JDK build version.
- name: Upload FlameCord
uses: actions/upload-artifact@v2.2.4
uses: actions/upload-artifact@v2
with:
name: FlameCord-JDK${{ matrix.java }}
path: FlameCord-Proxy/bootstrap/target/FlameCord.jar

8
.github/workflows/flamecord-pull-request.yml vendored
View File

@ -14,14 +14,14 @@ jobs:
# latest version up to the moment.
strategy:
matrix:
java: [8, 11, 16]
java: [8, 11, 17]
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Setup JAVA ${{ matrix.java }}
uses: actions/setup-java@v2.1.0
uses: actions/setup-java@v2
with:
java-version: ${{ matrix.java }}
distribution: 'adopt'
@ -29,7 +29,7 @@ jobs:
# The corresponding dependencies are stored in the cache to speed up the test.
- name: Cache Maven Packages
uses: actions/cache@v2.1.6
uses: actions/cache@v2
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@ -43,7 +43,7 @@ jobs:
# An artifact is generated in a compressed file according to each JDK build version.
- name: Upload FlameCord
uses: actions/upload-artifact@v2.2.4
uses: actions/upload-artifact@v2
with:
name: FlameCord-JDK${{ matrix.java }}
path: FlameCord-Proxy/bootstrap/target/FlameCord.jar

2
scripts/upstreamCommit.sh
View File

@ -15,7 +15,7 @@ if [ ! -z "$waterfall" ]; then
logsuffix="$logsuffix\n\nWaterfall Changes:\n$waterfall"
if [ -z "$updated" ]; then updated="Waterfall"; else updated="$updated/Waterfall"; fi
fi
disclaimer="Upstream has released updates that appears to apply and compile correctly.\nThis update has not been tested by 2LStudios and as with ANY update, please do your own testing"
disclaimer="Upstream has released updates that appear to apply and compile correctly.\nThis update has not been tested by 2LStudios and as with ANY update, please do your own testing"
if [ ! -z "$1" ]; then
disclaimer="$@"