From a3b39b4a5548958b7312b4bc7fa87899e0bd64a6 Mon Sep 17 00:00:00 2001 From: Heather White <66441550+HeatherComputer@users.noreply.github.com> Date: Thu, 17 Oct 2024 15:55:54 +0100 Subject: [PATCH 01/17] Rectify JiJ versioning issues --- client/forge-1.19/build.gradle | 8 ++++---- client/neoforge-1.21/build.gradle | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client/forge-1.19/build.gradle b/client/forge-1.19/build.gradle index d99b1bd..59061f5 100644 --- a/client/forge-1.19/build.gradle +++ b/client/forge-1.19/build.gradle @@ -140,10 +140,10 @@ dependencies { compileOnly("com.google.protobuf:protobuf-java:3.13.0") compileOnly("org.yaml:snakeyaml:1.4+") - jarJar(group: "club.moddedminecraft.polychat.core.messagelibrary", name: "message-library", version: "[2.0.2, 2.0.3)") - jarJar(group: "club.moddedminecraft.polychat.core.networklibrary", name: "network-library", version: "[2.0.2, 2.0.3)") - jarJar(group: "cclub.moddedminecraft.polychat.core.common", name: "common", version: "[2.0.2, 2.0.3)") - jarJar(group: "club.moddedminecraft.polychat.client.clientbase", name: "client-base", version: "[2.0.2, 2.0.3)") + jarJar(group: "club.moddedminecraft.polychat.core.messagelibrary", name: "message-library", version: "${version}") + jarJar(group: "club.moddedminecraft.polychat.core.networklibrary", name: "network-library", version: "${version}") + jarJar(group: "cclub.moddedminecraft.polychat.core.common", name: "common", version: "${version}") + jarJar(group: "club.moddedminecraft.polychat.client.clientbase", name: "client-base", version: "${version}") jarJar(group: "com.google.protobuf", name: "protobuf-java", version: "[3.13, 3.14)") jarJar(group: "org.yaml", name: "snakeyaml", version: "[1.4, 1.5)") diff --git a/client/neoforge-1.21/build.gradle b/client/neoforge-1.21/build.gradle index 14ce27c..12e9113 100644 --- a/client/neoforge-1.21/build.gradle +++ b/client/neoforge-1.21/build.gradle @@ -155,10 +155,10 @@ dependencies { compileOnly("com.google.protobuf:protobuf-java:3.13.0") compileOnly("org.yaml:snakeyaml:2.0") - jarJar(group: "club.moddedminecraft.polychat.core.messagelibrary", name: "message-library", version: "[2.0.2, 2.0.3)") - jarJar(group: "club.moddedminecraft.polychat.core.networklibrary", name: "network-library", version: "[2.0.2, 2.0.3)") - jarJar(group: "cclub.moddedminecraft.polychat.core.common", name: "common", version: "[2.0.2, 2.0.3)") - jarJar(group: "club.moddedminecraft.polychat.client.clientbase", name: "client-base", version: "[2.0.2, 2.0.3)") + jarJar(group: "club.moddedminecraft.polychat.core.messagelibrary", name: "message-library", version: "${version}") + jarJar(group: "club.moddedminecraft.polychat.core.networklibrary", name: "network-library", version: "${version}") + jarJar(group: "cclub.moddedminecraft.polychat.core.common", name: "common", version: "${version}") + jarJar(group: "club.moddedminecraft.polychat.client.clientbase", name: "client-base", version: "${version}") jarJar(group: "com.google.protobuf", name: "protobuf-java", version: "[3.13, 3.14)") jarJar(group: "org.yaml", name: "snakeyaml", version: "[2.0, 2.1)") From e0b3ac6005ef2e009a528a2b38b0d8b6bbf4d484 Mon Sep 17 00:00:00 2001 From: Heather White <66441550+HeatherComputer@users.noreply.github.com> Date: Thu, 17 Oct 2024 16:19:31 +0100 Subject: [PATCH 02/17] begin workflow - ready for a test --- .github/workflows/build.yml | 172 ++++++++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..dd9372a --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,172 @@ +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. + +name: Build Polychat Clients + +on: + workflow_dispatch: + inputs: + version: + #If we specify a version, that can work out nicely. + description: 'Polychat version to build' + required: true + + + +jobs: + + common: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'temurin' + + - name: Build Common + run: | + cd core/common + ./gradlew -Pversion=${{ inputs.version }} build + + - name: Upload Common + uses: actions/upload-artifact@v4 + with: + name: common-${{ inputs.version }}.jar + path: build/libs/common-${{ inputs.version }}.jar + + message-library: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'temurin' + + - name: Build Message Library + run: | + cd core/message-library + ./gradlew -Pversion=${{ inputs.version }} build + + - name: Upload Message Library + uses: actions/upload-artifact@v4 + with: + name: message-library-${{ inputs.version }}.jar + path: build/libs/message-library-${{ inputs.version }}.jar + + network-library: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'temurin' + + - name: Build Network Library + run: | + cd core/network-library + ./gradlew -Pversion=${{ inputs.version }} build + + - name: Upload Network Library + uses: actions/upload-artifact@v4 + with: + name: network-library-${{ inputs.version }}.jar + path: build/libs/network-library-${{ inputs.version }}.jar + + + client-base: + runs-on: ubuntu-latest + needs: [common, message-library, network-library] + + steps: + + - uses: actions/checkout@v3 + + - name: Download common + uses: actions/download-artifact@v4 + with: + name: common-${{ inputs.version }}.jar + path: client/client-base/libs + + - name: Download message-library + uses: actions/download-artifact@v4 + with: + name: message-library-${{ inputs.version }}.jar + path: client/client-base/libs + + - name: Download network-library + uses: actions/download-artifact@v4 + with: + name: network-library-${{ inputs.version }}.jar + path: client/client-base/libs + + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'temurin' + + - name: Build Client Base + run: | + cd client/client-base + ./gradlew -Pversion=${{ inputs.version }} build + + + - name: Upload Client Base + uses: actions/upload-artifact@v4 + with: + name: client-base-${{ inputs.version }}.jar + path: build/libs/client-base-${{ inputs.version }}.jar + + + + bundle-archives: + runs-on: ubuntu-latest + #TODO change this to depend on all the actual mod jars, not client base + needs: [client-base] + + steps: + #TODO change this to download each actual mod jar, not client base + - name: Download Client Base + uses: actions/download-artifact@v4 + with: + name: client-base-${{ inputs.version }}.jar + path: archives/ + + - name: Cleanup Old Archives + uses: geekyeggo/delete-artifact@v5 + with: + name: | + common-library-${{ inputs.version }}.jar + client-base-${{ inputs.version }}.jar + message-library-${{ inputs.version }}.jar + network-library-${{ inputs.version }}.jar + + - name: Bundle Archives + id: bundle + if: always() + run: | + cd archives + zip -r ../Polychat-Client-ALL_JARS-${{ inputs.version }}.zip * + + + - name: Upload Archives + uses: actions/upload-artifact@v4 + if: ${{ steps.bundle.conclusion != 'failure' }} + with: + name: Polychat-Client-ALL_JARS-${{ inputs.version }}.zip + path: Polychat-Client-ALL_JARS-${{ inputs.version }}.zip + From 8e5d502f84ca72495cfc223c73b4ad138ecf2776 Mon Sep 17 00:00:00 2001 From: Heather White <66441550+HeatherComputer@users.noreply.github.com> Date: Thu, 17 Oct 2024 16:32:52 +0100 Subject: [PATCH 03/17] no gradlew within subprojects --- .github/workflows/build.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dd9372a..c2ebb82 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,14 +31,14 @@ jobs: - name: Build Common run: | - cd core/common - ./gradlew -Pversion=${{ inputs.version }} build + cd core + ./gradlew -Pversion=${{ inputs.version }} :common:build - name: Upload Common uses: actions/upload-artifact@v4 with: name: common-${{ inputs.version }}.jar - path: build/libs/common-${{ inputs.version }}.jar + path: common/build/libs/common-${{ inputs.version }}.jar message-library: runs-on: ubuntu-latest @@ -54,14 +54,14 @@ jobs: - name: Build Message Library run: | - cd core/message-library - ./gradlew -Pversion=${{ inputs.version }} build + cd core + ./gradlew -Pversion=${{ inputs.version }} :message-library:build - name: Upload Message Library uses: actions/upload-artifact@v4 with: name: message-library-${{ inputs.version }}.jar - path: build/libs/message-library-${{ inputs.version }}.jar + path: message-library/build/libs/message-library-${{ inputs.version }}.jar network-library: runs-on: ubuntu-latest @@ -77,14 +77,14 @@ jobs: - name: Build Network Library run: | - cd core/network-library - ./gradlew -Pversion=${{ inputs.version }} build + cd core + ./gradlew -Pversion=${{ inputs.version }} :network-library:build - name: Upload Network Library uses: actions/upload-artifact@v4 with: name: network-library-${{ inputs.version }}.jar - path: build/libs/network-library-${{ inputs.version }}.jar + path: network-library/build/libs/network-library-${{ inputs.version }}.jar client-base: From 95cc2d48c1c6a31a430341efbb16a02af5c017c2 Mon Sep 17 00:00:00 2001 From: Heather White <66441550+HeatherComputer@users.noreply.github.com> Date: Thu, 17 Oct 2024 16:37:17 +0100 Subject: [PATCH 04/17] test fix path mismatch --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c2ebb82..1005ad8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,7 +38,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: common-${{ inputs.version }}.jar - path: common/build/libs/common-${{ inputs.version }}.jar + path: core/common/build/libs/common-${{ inputs.version }}.jar message-library: runs-on: ubuntu-latest @@ -61,7 +61,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: message-library-${{ inputs.version }}.jar - path: message-library/build/libs/message-library-${{ inputs.version }}.jar + path: core/message-library/build/libs/message-library-${{ inputs.version }}.jar network-library: runs-on: ubuntu-latest @@ -84,7 +84,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: network-library-${{ inputs.version }}.jar - path: network-library/build/libs/network-library-${{ inputs.version }}.jar + path: core/network-library/build/libs/network-library-${{ inputs.version }}.jar client-base: From 3c796c002961cd54a0d5718ca48cda3234d2f9a2 Mon Sep 17 00:00:00 2001 From: Heather White <66441550+HeatherComputer@users.noreply.github.com> Date: Thu, 17 Oct 2024 16:39:58 +0100 Subject: [PATCH 05/17] not a fix, but a debug --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1005ad8..6c7542c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,6 +33,7 @@ jobs: run: | cd core ./gradlew -Pversion=${{ inputs.version }} :common:build + ls common/build/libs - name: Upload Common uses: actions/upload-artifact@v4 @@ -56,6 +57,7 @@ jobs: run: | cd core ./gradlew -Pversion=${{ inputs.version }} :message-library:build + ls message-library/build/libs - name: Upload Message Library uses: actions/upload-artifact@v4 @@ -79,6 +81,7 @@ jobs: run: | cd core ./gradlew -Pversion=${{ inputs.version }} :network-library:build + ls network-library/build/libs - name: Upload Network Library uses: actions/upload-artifact@v4 From e87e76ca12d18f376da812b3cbb3bcb813fe3901 Mon Sep 17 00:00:00 2001 From: Heather White <66441550+HeatherComputer@users.noreply.github.com> Date: Thu, 17 Oct 2024 16:51:51 +0100 Subject: [PATCH 06/17] Version argument wasn't applying correctly. I do believe this should fix it. --- core/common/build.gradle | 2 +- core/common/gradle.properties | 1 + core/message-library/build.gradle | 2 -- core/message-library/gradle.properties | 1 + core/network-library/build.gradle | 1 - core/network-library/gradle.properties | 1 + 6 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 core/common/gradle.properties create mode 100644 core/message-library/gradle.properties create mode 100644 core/network-library/gradle.properties diff --git a/core/common/build.gradle b/core/common/build.gradle index 7f11877..46d725a 100644 --- a/core/common/build.gradle +++ b/core/common/build.gradle @@ -2,7 +2,7 @@ plugins{ id 'java' } -version = "2.0.2" + dependencies { // Use JUnit test framework diff --git a/core/common/gradle.properties b/core/common/gradle.properties new file mode 100644 index 0000000..fb7cb53 --- /dev/null +++ b/core/common/gradle.properties @@ -0,0 +1 @@ +version=2.0.2 \ No newline at end of file diff --git a/core/message-library/build.gradle b/core/message-library/build.gradle index 0b7e3d2..84882cf 100644 --- a/core/message-library/build.gradle +++ b/core/message-library/build.gradle @@ -1,8 +1,6 @@ apply plugin: 'java' apply plugin: 'com.google.protobuf' -version = "2.0.2" - repositories { maven { url "https://plugins.gradle.org/m2/" } } diff --git a/core/message-library/gradle.properties b/core/message-library/gradle.properties new file mode 100644 index 0000000..fb7cb53 --- /dev/null +++ b/core/message-library/gradle.properties @@ -0,0 +1 @@ +version=2.0.2 \ No newline at end of file diff --git a/core/network-library/build.gradle b/core/network-library/build.gradle index a124e40..5f06a41 100644 --- a/core/network-library/build.gradle +++ b/core/network-library/build.gradle @@ -2,7 +2,6 @@ plugins{ id 'java' } -version = "2.0.2" dependencies { // Use JUnit test framework diff --git a/core/network-library/gradle.properties b/core/network-library/gradle.properties new file mode 100644 index 0000000..fb7cb53 --- /dev/null +++ b/core/network-library/gradle.properties @@ -0,0 +1 @@ +version=2.0.2 \ No newline at end of file From 8bf57179d9f9a4dd102e1b89401fed3f4626ebf1 Mon Sep 17 00:00:00 2001 From: Heather White <66441550+HeatherComputer@users.noreply.github.com> Date: Thu, 17 Oct 2024 17:09:07 +0100 Subject: [PATCH 07/17] i hate gradle sometimes --- core/common/gradle.properties | 1 - core/message-library/gradle.properties | 1 - core/network-library/gradle.properties | 1 - 3 files changed, 3 deletions(-) delete mode 100644 core/common/gradle.properties delete mode 100644 core/message-library/gradle.properties delete mode 100644 core/network-library/gradle.properties diff --git a/core/common/gradle.properties b/core/common/gradle.properties deleted file mode 100644 index fb7cb53..0000000 --- a/core/common/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -version=2.0.2 \ No newline at end of file diff --git a/core/message-library/gradle.properties b/core/message-library/gradle.properties deleted file mode 100644 index fb7cb53..0000000 --- a/core/message-library/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -version=2.0.2 \ No newline at end of file diff --git a/core/network-library/gradle.properties b/core/network-library/gradle.properties deleted file mode 100644 index fb7cb53..0000000 --- a/core/network-library/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -version=2.0.2 \ No newline at end of file From e99e1d8b70a2420493d3ad1cad38a27e4b1019ec Mon Sep 17 00:00:00 2001 From: Heather White <66441550+HeatherComputer@users.noreply.github.com> Date: Thu, 17 Oct 2024 17:11:42 +0100 Subject: [PATCH 08/17] so... why was this there, when each subproject also specified a version in build.gradle? blame tracey apparently --- core/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/core/build.gradle b/core/build.gradle index 38b2ff6..0ff1a06 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -1,5 +1,4 @@ allprojects { - version = "2.0.2" repositories { jcenter() mavenCentral() From c369e4e5d494508aa8cf443bdd427b8f7f80461c Mon Sep 17 00:00:00 2001 From: Heather White <66441550+HeatherComputer@users.noreply.github.com> Date: Thu, 17 Oct 2024 17:15:46 +0100 Subject: [PATCH 09/17] aaand now client base should compile properly! --- client/client-base/build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/client/client-base/build.gradle b/client/client-base/build.gradle index 72e5ca8..776f77d 100644 --- a/client/client-base/build.gradle +++ b/client/client-base/build.gradle @@ -2,8 +2,6 @@ plugins { id 'java' } -version = "2.0.2" - repositories { mavenCentral() flatDir { From 83eb3e7519b4a102ab1450df199430f6cf0e9bfa Mon Sep 17 00:00:00 2001 From: Heather White <66441550+HeatherComputer@users.noreply.github.com> Date: Thu, 17 Oct 2024 17:20:24 +0100 Subject: [PATCH 10/17] remove existing debug prints, add another --- .github/workflows/build.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6c7542c..8dcf740 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,6 @@ jobs: run: | cd core ./gradlew -Pversion=${{ inputs.version }} :common:build - ls common/build/libs - name: Upload Common uses: actions/upload-artifact@v4 @@ -57,7 +56,6 @@ jobs: run: | cd core ./gradlew -Pversion=${{ inputs.version }} :message-library:build - ls message-library/build/libs - name: Upload Message Library uses: actions/upload-artifact@v4 @@ -81,7 +79,6 @@ jobs: run: | cd core ./gradlew -Pversion=${{ inputs.version }} :network-library:build - ls network-library/build/libs - name: Upload Network Library uses: actions/upload-artifact@v4 @@ -126,6 +123,7 @@ jobs: run: | cd client/client-base ./gradlew -Pversion=${{ inputs.version }} build + ls build/libs - name: Upload Client Base From 099375855ad688f18b38201641b799d2ff2332e1 Mon Sep 17 00:00:00 2001 From: Heather White <66441550+HeatherComputer@users.noreply.github.com> Date: Fri, 18 Oct 2024 15:26:22 +0100 Subject: [PATCH 11/17] deprecated setup actions --- .github/workflows/build.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8dcf740..4291120 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,10 +21,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'temurin' @@ -44,10 +44,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'temurin' @@ -67,10 +67,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'temurin' @@ -93,7 +93,7 @@ jobs: steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Download common uses: actions/download-artifact@v4 @@ -114,7 +114,7 @@ jobs: path: client/client-base/libs - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'temurin' From f54ddd8cfc506a1025067fc7dd73667e693f6e40 Mon Sep 17 00:00:00 2001 From: Heather White <66441550+HeatherComputer@users.noreply.github.com> Date: Fri, 18 Oct 2024 15:29:17 +0100 Subject: [PATCH 12/17] fix upload issue --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4291120..4fbaa92 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -130,7 +130,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: client-base-${{ inputs.version }}.jar - path: build/libs/client-base-${{ inputs.version }}.jar + path: client/client-base/build/libs/client-base-${{ inputs.version }}.jar From 12a18d69ab8a37b27fba59c1f355ed473b07a5c4 Mon Sep 17 00:00:00 2001 From: Heather White <66441550+HeatherComputer@users.noreply.github.com> Date: Fri, 18 Oct 2024 15:31:37 +0100 Subject: [PATCH 13/17] error in delete action --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4fbaa92..e8adc23 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -151,7 +151,7 @@ jobs: uses: geekyeggo/delete-artifact@v5 with: name: | - common-library-${{ inputs.version }}.jar + common-${{ inputs.version }}.jar client-base-${{ inputs.version }}.jar message-library-${{ inputs.version }}.jar network-library-${{ inputs.version }}.jar From 371ddaca332784536184f2e17889c4c5fb433934 Mon Sep 17 00:00:00 2001 From: Heather White <66441550+HeatherComputer@users.noreply.github.com> Date: Fri, 18 Oct 2024 15:32:42 +0100 Subject: [PATCH 14/17] remove debug print --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e8adc23..ad9d936 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -123,7 +123,6 @@ jobs: run: | cd client/client-base ./gradlew -Pversion=${{ inputs.version }} build - ls build/libs - name: Upload Client Base From 06adaaff69595db79af403617f25cc7ab6747c32 Mon Sep 17 00:00:00 2001 From: Heather White <66441550+HeatherComputer@users.noreply.github.com> Date: Fri, 18 Oct 2024 15:37:58 +0100 Subject: [PATCH 15/17] remove version reference from bukkit 1.7.10 build.gradle --- client/bukkit-1.7.10/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/client/bukkit-1.7.10/build.gradle b/client/bukkit-1.7.10/build.gradle index 5cbcf65..faa914a 100644 --- a/client/bukkit-1.7.10/build.gradle +++ b/client/bukkit-1.7.10/build.gradle @@ -2,7 +2,6 @@ plugins { id 'java-library' } -version "2.0.2" group = 'club.moddedminecraft.polychat.bukkit1710' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'polychat-bukkit1710' From 5fd19b533619a8d47689b9f18d2d8249cad10088 Mon Sep 17 00:00:00 2001 From: Heather White <66441550+HeatherComputer@users.noreply.github.com> Date: Fri, 18 Oct 2024 15:41:09 +0100 Subject: [PATCH 16/17] build bukkit 1.7.10 --- .github/workflows/build.yml | 51 +++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ad9d936..af9a2b9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -132,6 +132,57 @@ jobs: path: client/client-base/build/libs/client-base-${{ inputs.version }}.jar + bukkit-1-7-10: + runs-on: ubuntu-latest + needs: [client-base] + + steps: + + - uses: actions/checkout@v4 + + - name: Download common + uses: actions/download-artifact@v4 + with: + name: common-${{ inputs.version }}.jar + path: client/bukkit-1.7.10/libs + + - name: Download message-library + uses: actions/download-artifact@v4 + with: + name: message-library-${{ inputs.version }}.jar + path: client/bukkit-1.7.10/libs + + - name: Download network-library + uses: actions/download-artifact@v4 + with: + name: network-library-${{ inputs.version }}.jar + path: client/bukkit-1.7.10/libs + + - name: Download client-base + uses: actions/download-artifact@v4 + with: + name: client-base-${{ inputs.version }}.jar + path: client/bukkit-1.7.10/libs + + - name: Set up JDK 8 + uses: actions/setup-java@v4 + with: + java-version: '8' + distribution: 'temurin' + + - name: Build Bukkit 1.7.10 + run: | + cd client/bukkit-1.7.10 + ./gradlew -Pversion=${{ inputs.version }} build + + + - name: Upload Bukkit 1.7.10 + uses: actions/upload-artifact@v4 + with: + name: polychat-bukkit1710-${{ inputs.version }}.jar + path: client/bukkit-1.7.10/build/libs/polychat-bukkit1710-${{ inputs.version }}.jar + + bundle-archives: runs-on: ubuntu-latest From e265358bbe3c70a25ea7d0f397b42249d8c958ae Mon Sep 17 00:00:00 2001 From: Heather White <66441550+HeatherComputer@users.noreply.github.com> Date: Fri, 18 Oct 2024 15:42:00 +0100 Subject: [PATCH 17/17] bundle bukkit 1.7.10 in archives --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index af9a2b9..637597a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -187,14 +187,14 @@ jobs: bundle-archives: runs-on: ubuntu-latest #TODO change this to depend on all the actual mod jars, not client base - needs: [client-base] + needs: [bukkit-1-7-10] steps: #TODO change this to download each actual mod jar, not client base - - name: Download Client Base + - name: Download Bukkit 1.7.10 uses: actions/download-artifact@v4 with: - name: client-base-${{ inputs.version }}.jar + name: polychat-bukkit1710-${{ inputs.version }}.jar path: archives/ - name: Cleanup Old Archives