From 17233dbaa402d25907a9031a04973261b47198bb Mon Sep 17 00:00:00 2001 From: Oliver Date: Sat, 29 Mar 2025 21:55:37 +0100 Subject: [PATCH] deployment: add Modrinth API key to deployment scripts and update channel naming conventions --- .../deploy-release-fancyholograms.yml | 2 ++ .../deploy-snapshot-fancyholograms.yml | 2 ++ .../release_deployment_config.json | 2 +- .../snapshot_deployment_config.json | 2 +- .../modrinth/CreateVersionRequest.java | 20 ------------------- .../deployment/modrinth/ModrinthService.java | 2 +- 6 files changed, 7 insertions(+), 23 deletions(-) delete mode 100644 tools/deployment/src/main/java/de/oliver/deployment/modrinth/CreateVersionRequest.java diff --git a/.github/workflows/deploy-release-fancyholograms.yml b/.github/workflows/deploy-release-fancyholograms.yml index 2ff4e7e0..d602c641 100644 --- a/.github/workflows/deploy-release-fancyholograms.yml +++ b/.github/workflows/deploy-release-fancyholograms.yml @@ -34,6 +34,8 @@ jobs: run: ./gradlew :tools:deployment:shadowJar - name: Deploy + env: + MODRINTH_API_KEY: ${{ secrets.MODRINTH_API_KEY }} run: cd tools/deployment/build/libs && java -jar deployment.jar ../../../../plugins/fancyholograms/release_deployment_config.json diff --git a/.github/workflows/deploy-snapshot-fancyholograms.yml b/.github/workflows/deploy-snapshot-fancyholograms.yml index 4b2b8423..fe2b810c 100644 --- a/.github/workflows/deploy-snapshot-fancyholograms.yml +++ b/.github/workflows/deploy-snapshot-fancyholograms.yml @@ -34,6 +34,8 @@ jobs: run: ./gradlew :tools:deployment:shadowJar - name: Deploy + env: + MODRINTH_API_KEY: ${{ secrets.MODRINTH_API_KEY }} run: cd tools/deployment/build/libs && java -jar deployment.jar ../../../../plugins/fancyholograms/snapshot_deployment_config.json diff --git a/plugins/fancyholograms/release_deployment_config.json b/plugins/fancyholograms/release_deployment_config.json index f1752823..0ca54119 100644 --- a/plugins/fancyholograms/release_deployment_config.json +++ b/plugins/fancyholograms/release_deployment_config.json @@ -18,7 +18,7 @@ "1.21.3", "1.21.4" ], - "channel": "release", + "channel": "RELEASE", "loaders": [ "paper", "folia" diff --git a/plugins/fancyholograms/snapshot_deployment_config.json b/plugins/fancyholograms/snapshot_deployment_config.json index b7be6951..69df14b1 100644 --- a/plugins/fancyholograms/snapshot_deployment_config.json +++ b/plugins/fancyholograms/snapshot_deployment_config.json @@ -18,7 +18,7 @@ "1.21.3", "1.21.4" ], - "channel": "alpha", + "channel": "ALPHA", "loaders": [ "paper", "folia" diff --git a/tools/deployment/src/main/java/de/oliver/deployment/modrinth/CreateVersionRequest.java b/tools/deployment/src/main/java/de/oliver/deployment/modrinth/CreateVersionRequest.java deleted file mode 100644 index 4a576836..00000000 --- a/tools/deployment/src/main/java/de/oliver/deployment/modrinth/CreateVersionRequest.java +++ /dev/null @@ -1,20 +0,0 @@ -package de.oliver.deployment.modrinth; - -import com.google.gson.annotations.SerializedName; - -public record CreateVersionRequest( - String name, - @SerializedName("version_number") String versionName, - String changelog, - String[] dependencies, - @SerializedName("game_versions") String[] gameVersions, - @SerializedName("version_type") String versionType, - String[] loaders, - boolean featured, - String status, - @SerializedName("requested_status") String requestedStatus, - @SerializedName("project_id") String projectId, - @SerializedName("file_parts") String[] fileParts, - @SerializedName("primary_file") String primaryFile -) { -} diff --git a/tools/deployment/src/main/java/de/oliver/deployment/modrinth/ModrinthService.java b/tools/deployment/src/main/java/de/oliver/deployment/modrinth/ModrinthService.java index a61a85d0..6b1af387 100644 --- a/tools/deployment/src/main/java/de/oliver/deployment/modrinth/ModrinthService.java +++ b/tools/deployment/src/main/java/de/oliver/deployment/modrinth/ModrinthService.java @@ -45,7 +45,7 @@ public class ModrinthService { changelog, new ArrayList<>(), Arrays.asList(config.supportedVersions()), - ProjectVersion.VersionType.ALPHA, + ProjectVersion.VersionType.valueOf(config.channel()), Arrays.asList(config.loaders()), config.featured(), config.projectID(),