From ed48f4e0f632fa4615ab2e6a09b741fc1f510373 Mon Sep 17 00:00:00 2001 From: MrPowerGamerBR Date: Tue, 14 Jan 2025 00:58:18 -0300 Subject: [PATCH] Update workflows --- .github/workflows/auto-update.yml | 7 +++---- .github/workflows/build-without-pwt.yml | 6 +++--- .github/workflows/build.yml | 6 +++--- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml index e53870c..e29b583 100644 --- a/.github/workflows/auto-update.yml +++ b/.github/workflows/auto-update.yml @@ -1,9 +1,8 @@ name: Automatically update Paper commit hash on: workflow_dispatch: {} - # Paper did not release a ver/1.21.3 branch, so we need to disable it manually - # schedule: - # - cron: "0 0 * * *" + schedule: + - cron: "0 0 * * *" jobs: build: runs-on: ubuntu-latest @@ -12,7 +11,7 @@ jobs: uses: actions/checkout@v3 with: path: 'SparklyPaper' - ref: 'ver/1.21.3' + ref: 'ver/1.21.4' token: ${{ secrets.LORITTA_PAT }} - name: Checkout Paper Repository diff --git a/.github/workflows/build-without-pwt.yml b/.github/workflows/build-without-pwt.yml index 90387f6..22e9424 100644 --- a/.github/workflows/build-without-pwt.yml +++ b/.github/workflows/build-without-pwt.yml @@ -29,7 +29,7 @@ jobs: - name: Delete Parallel world ticking patch run: rm sparklypaper-server/minecraft-patches/features/*-Parallel-world-ticking.patch sparklypaper-server/paper-patches/features/*-Parallel-world-ticking.patch - name: Apply Patches - run: ./gradlew -PsparklypaperImplementationVersionSuffix=without-pwt applyPatches + run: ./gradlew -PsparklypaperImplementationVersionSuffix=without-pwt applyAllPatches - name: Build run: ./gradlew -PsparklypaperImplementationVersionSuffix=without-pwt build - name: Create Paperclip JAR @@ -38,9 +38,9 @@ jobs: name: "Upload Mojang Mappings Paperclip JAR" with: name: SparklyPaper (without Parallel World Ticking) Paperclip (Mojang Mappings - mojmap) - path: "build/libs/SparklyPaper-paperclip-*-mojmap.jar" + path: "sparklypaper-server/build/libs/SparklyPaper-paperclip-*-mojmap.jar" - uses: actions/upload-artifact@v4 name: "Upload Spigot Mappings (reobf) Paperclip JAR" with: name: SparklyPaper (without Parallel World Ticking) Paperclip (Spigot Mappings - reobf) - path: "build/libs/SparklyPaper-paperclip-*-reobf.jar" + path: "sparklypaper-server/build/libs/SparklyPaper-paperclip-*-reobf.jar" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bfbe36a..e32f7d2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Apply Patches - run: ./gradlew applyPatches + run: ./gradlew applyAllPatches - name: Build run: ./gradlew build - name: Publish publications and dev bundle @@ -41,9 +41,9 @@ jobs: name: "Upload Mojang Mappings Paperclip JAR" with: name: SparklyPaper Paperclip (Mojang Mappings - mojmap) - path: "build/libs/SparklyPaper-paperclip-*-mojmap.jar" + path: "sparklypaper-server/build/libs/SparklyPaper-paperclip-*-mojmap.jar" - uses: actions/upload-artifact@v4 name: "Upload Spigot Mappings (reobf) Paperclip JAR" with: name: SparklyPaper Paperclip (Spigot Mappings - reobf) - path: "build/libs/SparklyPaper-paperclip-*-reobf.jar" \ No newline at end of file + path: "sparklypaper-server/build/libs/SparklyPaper-paperclip-*-reobf.jar" \ No newline at end of file