Merge remote-tracking branch 'origin/trunk' into trunk

WorldQL · Jul 27, 2022 · fde6767 · fde6767
2 parents cba833e + ae8b11d
commit fde6767
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,12 +24,12 @@ jobs:
         java-version: ${{ env.JDK_VERSION }}
         cache: maven
     - name: Build with Maven
-      working-directory: ./ServerTransferPlugin
+      working-directory: ./server-transfer-plugin
       run: mvn -B package --file pom.xml
     - name: Resolve .jar name
       id: prep
       run: |
-        JAR_PATH=`echo ServerTransferPlugin/target/server-transfer-plugin*.jar`
+        JAR_PATH=`echo server-transfer-plugin/target/server-transfer-plugin*.jar`
         JAR_NAME=`basename ${JAR_PATH}`
 
         VERSION=`git rev-parse --short HEAD`
@@ -68,12 +68,12 @@ jobs:
         java-version: ${{ env.JDK_VERSION }}
         cache: gradle
     - name: Build with Gradle
-      working-directory: ./ServerTransferMod
+      working-directory: ./server-transfer-mod
       run: ./gradlew build --no-daemon
     - name: Resolve .jar name
       id: prep
       run: |
-        JAR_PATH=`echo ServerTransferMod/build/libs/server-transfer-mod*[^sources].jar`
+        JAR_PATH=`echo server-transfer-mod/build/libs/server-transfer-mod*[^sources].jar`
         JAR_NAME=`basename ${JAR_PATH}`
 
         VERSION=`git rev-parse --short HEAD`

diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
@@ -22,10 +22,10 @@ jobs:
           server-password: MAVEN_SECRET
 
       - name: Build with Maven
-        working-directory: ./ServerTransferPlugin
+        working-directory: ./server-transfer-plugin
         run: mvn -B package --file pom.xml
       - name: Publish package
-        working-directory: ./ServerTransferPlugin
+        working-directory: ./server-transfer-plugin
         run: mvn -e --batch-mode deploy
         env:
           MAVEN_NAME: ${{ secrets.MAVEN_NAME }}