From 3863eec224d07c23c3ed8a5d938dd484e2401817 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 9 Mar 2026 23:16:14 +0000 Subject: [PATCH 1/3] Initial plan From d5471b7aebd32691e2874452b658185d99fbd7d0 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 9 Mar 2026 23:21:10 +0000 Subject: [PATCH 2/3] chore: update workflows to use upload-artifact@v7 with non-zipped individual jar uploads Co-authored-by: JRoy <10731363+JRoy@users.noreply.github.com> --- .github/workflows/build-master.yml | 60 ++++++++++++++++++++++++++++-- .github/workflows/build-pr.yml | 56 +++++++++++++++++++++++++++- 2 files changed, 112 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-master.yml b/.github/workflows/build-master.yml index dff69a15f53..51308fb0f9e 100644 --- a/.github/workflows/build-master.yml +++ b/.github/workflows/build-master.yml @@ -41,11 +41,65 @@ jobs: report_paths: '**/build/test-results/test*/TEST-*.xml' - name: Archive plugin jars on GitHub - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: EssentialsX plugin jars path: jars/ + - name: Upload EssentialsX jar + uses: actions/upload-artifact@v7 + with: + path: jars/EssentialsX-*.jar + archive: false + + - name: Upload EssentialsAntiBuild jar + uses: actions/upload-artifact@v7 + with: + path: jars/EssentialsAntiBuild-*.jar + archive: false + + - name: Upload EssentialsChat jar + uses: actions/upload-artifact@v7 + with: + path: jars/EssentialsChat-*.jar + archive: false + + - name: Upload EssentialsDiscord jar + uses: actions/upload-artifact@v7 + with: + path: jars/EssentialsDiscord-*.jar + archive: false + + - name: Upload EssentialsDiscordLink jar + uses: actions/upload-artifact@v7 + with: + path: jars/EssentialsDiscordLink-*.jar + archive: false + + - name: Upload EssentialsGeoIP jar + uses: actions/upload-artifact@v7 + with: + path: jars/EssentialsGeoIP-*.jar + archive: false + + - name: Upload EssentialsProtect jar + uses: actions/upload-artifact@v7 + with: + path: jars/EssentialsProtect-*.jar + archive: false + + - name: Upload EssentialsSpawn jar + uses: actions/upload-artifact@v7 + with: + path: jars/EssentialsSpawn-*.jar + archive: false + + - name: Upload EssentialsXMPP jar + uses: actions/upload-artifact@v7 + with: + path: jars/EssentialsXMPP-*.jar + archive: false + - name: Deploy to Maven repo if: ${{ success() && github.event_name == 'push' && github.repository == 'EssentialsX/Essentials' && github.ref == 'refs/heads/2.x' }} env: @@ -67,7 +121,7 @@ jobs: cp -r EssentialsXMPP/build/docs/javadoc/ javadocs/EssentialsXMPP/ - name: Archive Javadocs - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: javadocs path: javadocs/ @@ -85,7 +139,7 @@ jobs: node-version: 22 - name: Download Javadocs - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v8 with: name: javadocs path: javadocs/ diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index a5508d14400..8ba1955e92c 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -48,7 +48,61 @@ jobs: report_paths: '**/build/test-results/test*/TEST-*.xml' - name: Archive plugin jars on GitHub - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: EssentialsX plugin jars path: jars/ + + - name: Upload EssentialsX jar + uses: actions/upload-artifact@v7 + with: + path: jars/EssentialsX-*.jar + archive: false + + - name: Upload EssentialsAntiBuild jar + uses: actions/upload-artifact@v7 + with: + path: jars/EssentialsAntiBuild-*.jar + archive: false + + - name: Upload EssentialsChat jar + uses: actions/upload-artifact@v7 + with: + path: jars/EssentialsChat-*.jar + archive: false + + - name: Upload EssentialsDiscord jar + uses: actions/upload-artifact@v7 + with: + path: jars/EssentialsDiscord-*.jar + archive: false + + - name: Upload EssentialsDiscordLink jar + uses: actions/upload-artifact@v7 + with: + path: jars/EssentialsDiscordLink-*.jar + archive: false + + - name: Upload EssentialsGeoIP jar + uses: actions/upload-artifact@v7 + with: + path: jars/EssentialsGeoIP-*.jar + archive: false + + - name: Upload EssentialsProtect jar + uses: actions/upload-artifact@v7 + with: + path: jars/EssentialsProtect-*.jar + archive: false + + - name: Upload EssentialsSpawn jar + uses: actions/upload-artifact@v7 + with: + path: jars/EssentialsSpawn-*.jar + archive: false + + - name: Upload EssentialsXMPP jar + uses: actions/upload-artifact@v7 + with: + path: jars/EssentialsXMPP-*.jar + archive: false From b01c733daf60499783de65993b8254cd687c9329 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 9 Mar 2026 23:31:28 +0000 Subject: [PATCH 3/3] Fix workflow jar path globs: add missing X in EssentialsX addon names Co-authored-by: JRoy <10731363+JRoy@users.noreply.github.com> --- .github/workflows/build-master.yml | 32 +++++++++++++++--------------- .github/workflows/build-pr.yml | 32 +++++++++++++++--------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/workflows/build-master.yml b/.github/workflows/build-master.yml index 51308fb0f9e..4abe80ed260 100644 --- a/.github/workflows/build-master.yml +++ b/.github/workflows/build-master.yml @@ -52,52 +52,52 @@ jobs: path: jars/EssentialsX-*.jar archive: false - - name: Upload EssentialsAntiBuild jar + - name: Upload EssentialsXAntiBuild jar uses: actions/upload-artifact@v7 with: - path: jars/EssentialsAntiBuild-*.jar + path: jars/EssentialsXAntiBuild-*.jar archive: false - - name: Upload EssentialsChat jar + - name: Upload EssentialsXChat jar uses: actions/upload-artifact@v7 with: - path: jars/EssentialsChat-*.jar + path: jars/EssentialsXChat-*.jar archive: false - - name: Upload EssentialsDiscord jar + - name: Upload EssentialsXDiscord jar uses: actions/upload-artifact@v7 with: - path: jars/EssentialsDiscord-*.jar + path: jars/EssentialsXDiscord-*.jar archive: false - - name: Upload EssentialsDiscordLink jar + - name: Upload EssentialsXDiscordLink jar uses: actions/upload-artifact@v7 with: - path: jars/EssentialsDiscordLink-*.jar + path: jars/EssentialsXDiscordLink-*.jar archive: false - - name: Upload EssentialsGeoIP jar + - name: Upload EssentialsXGeoIP jar uses: actions/upload-artifact@v7 with: - path: jars/EssentialsGeoIP-*.jar + path: jars/EssentialsXGeoIP-*.jar archive: false - - name: Upload EssentialsProtect jar + - name: Upload EssentialsXProtect jar uses: actions/upload-artifact@v7 with: - path: jars/EssentialsProtect-*.jar + path: jars/EssentialsXProtect-*.jar archive: false - - name: Upload EssentialsSpawn jar + - name: Upload EssentialsXSpawn jar uses: actions/upload-artifact@v7 with: - path: jars/EssentialsSpawn-*.jar + path: jars/EssentialsXSpawn-*.jar archive: false - - name: Upload EssentialsXMPP jar + - name: Upload EssentialsXXMPP jar uses: actions/upload-artifact@v7 with: - path: jars/EssentialsXMPP-*.jar + path: jars/EssentialsXXMPP-*.jar archive: false - name: Deploy to Maven repo diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 8ba1955e92c..7a91e356dc9 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -59,50 +59,50 @@ jobs: path: jars/EssentialsX-*.jar archive: false - - name: Upload EssentialsAntiBuild jar + - name: Upload EssentialsXAntiBuild jar uses: actions/upload-artifact@v7 with: - path: jars/EssentialsAntiBuild-*.jar + path: jars/EssentialsXAntiBuild-*.jar archive: false - - name: Upload EssentialsChat jar + - name: Upload EssentialsXChat jar uses: actions/upload-artifact@v7 with: - path: jars/EssentialsChat-*.jar + path: jars/EssentialsXChat-*.jar archive: false - - name: Upload EssentialsDiscord jar + - name: Upload EssentialsXDiscord jar uses: actions/upload-artifact@v7 with: - path: jars/EssentialsDiscord-*.jar + path: jars/EssentialsXDiscord-*.jar archive: false - - name: Upload EssentialsDiscordLink jar + - name: Upload EssentialsXDiscordLink jar uses: actions/upload-artifact@v7 with: - path: jars/EssentialsDiscordLink-*.jar + path: jars/EssentialsXDiscordLink-*.jar archive: false - - name: Upload EssentialsGeoIP jar + - name: Upload EssentialsXGeoIP jar uses: actions/upload-artifact@v7 with: - path: jars/EssentialsGeoIP-*.jar + path: jars/EssentialsXGeoIP-*.jar archive: false - - name: Upload EssentialsProtect jar + - name: Upload EssentialsXProtect jar uses: actions/upload-artifact@v7 with: - path: jars/EssentialsProtect-*.jar + path: jars/EssentialsXProtect-*.jar archive: false - - name: Upload EssentialsSpawn jar + - name: Upload EssentialsXSpawn jar uses: actions/upload-artifact@v7 with: - path: jars/EssentialsSpawn-*.jar + path: jars/EssentialsXSpawn-*.jar archive: false - - name: Upload EssentialsXMPP jar + - name: Upload EssentialsXXMPP jar uses: actions/upload-artifact@v7 with: - path: jars/EssentialsXMPP-*.jar + path: jars/EssentialsXXMPP-*.jar archive: false