From e70067a42da95829cdad31ce27b7e648ad745d7e Mon Sep 17 00:00:00 2001
From: Luccboy <58391278+Luccboy@users.noreply.github.com>
Date: Tue, 30 Nov 2021 20:05:09 +0100
Subject: [PATCH] Updated workflow for Github Actions and fixed typo

---
 .github/workflows/flamecord-build.yml        | 8 ++++----
 .github/workflows/flamecord-pull-request.yml | 8 ++++----
 scripts/upstreamCommit.sh                    | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/flamecord-build.yml b/.github/workflows/flamecord-build.yml
index 068c0c7..6ba7f9a 100644
--- a/.github/workflows/flamecord-build.yml
+++ b/.github/workflows/flamecord-build.yml
@@ -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
diff --git a/.github/workflows/flamecord-pull-request.yml b/.github/workflows/flamecord-pull-request.yml
index 85ad794..c12eb25 100644
--- a/.github/workflows/flamecord-pull-request.yml
+++ b/.github/workflows/flamecord-pull-request.yml
@@ -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
diff --git a/scripts/upstreamCommit.sh b/scripts/upstreamCommit.sh
index 8aaad42..4880b35 100755
--- a/scripts/upstreamCommit.sh
+++ b/scripts/upstreamCommit.sh
@@ -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="$@"